lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 151/717] bus: mhi: core: Fix null pointer access when parsing MHI configuration
    Date
    From: Carl Yin <carl.yin@quectel.com>

    [ Upstream commit f4d0b39c842585c74bce8f8a80553369181b72df ]

    Functions parse_ev_cfg() and parse_ch_cfg() access mhi_cntrl->mhi_dev
    before it is set in function mhi_register_controller(),
    use cntrl_dev instead of mhi_dev.

    Fixes: 0cbf260820fa ("bus: mhi: core: Add support for registering MHI controllers")
    Signed-off-by: Carl Yin <carl.yin@quectel.com>
    Reviewed-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
    Reviewed-by: Hemant Kumar <hemantk@codeaurora.org>
    Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
    Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/bus/mhi/core/init.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/bus/mhi/core/init.c b/drivers/bus/mhi/core/init.c
    index 0a09f8215057d..8cefa359fccd8 100644
    --- a/drivers/bus/mhi/core/init.c
    +++ b/drivers/bus/mhi/core/init.c
    @@ -610,7 +610,7 @@ static int parse_ev_cfg(struct mhi_controller *mhi_cntrl,
    {
    struct mhi_event *mhi_event;
    const struct mhi_event_config *event_cfg;
    - struct device *dev = &mhi_cntrl->mhi_dev->dev;
    + struct device *dev = mhi_cntrl->cntrl_dev;
    int i, num;

    num = config->num_events;
    @@ -692,7 +692,7 @@ static int parse_ch_cfg(struct mhi_controller *mhi_cntrl,
    const struct mhi_controller_config *config)
    {
    const struct mhi_channel_config *ch_cfg;
    - struct device *dev = &mhi_cntrl->mhi_dev->dev;
    + struct device *dev = mhi_cntrl->cntrl_dev;
    int i;
    u32 chan;

    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:10    [W:5.893 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site