lkml.org 
[lkml]   [2019]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 055/244] slimbus: fix a potential NULL pointer dereference in of_qcom_slim_ngd_register
    Date
    From: Kangjie Lu <kjlu@umn.edu>

    [ Upstream commit 06d5d6b7f9948a89543e1160ef852d57892c750d ]

    In case platform_device_alloc fails, the fix returns an error
    code to avoid the NULL pointer dereference.

    Signed-off-by: Kangjie Lu <kjlu@umn.edu>
    Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/slimbus/qcom-ngd-ctrl.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
    index 14a9d18306cbf..f63d1b8a09335 100644
    --- a/drivers/slimbus/qcom-ngd-ctrl.c
    +++ b/drivers/slimbus/qcom-ngd-ctrl.c
    @@ -1331,6 +1331,10 @@ static int of_qcom_slim_ngd_register(struct device *parent,
    return -ENOMEM;

    ngd->pdev = platform_device_alloc(QCOM_SLIM_NGD_DRV_NAME, id);
    + if (!ngd->pdev) {
    + kfree(ngd);
    + return -ENOMEM;
    + }
    ngd->id = id;
    ngd->pdev->dev.parent = parent;
    ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-05-22 21:45    [W:4.148 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site