lkml.org 
[lkml]   [2019]   [May]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 225/276] thunderbolt: Fix to check the return value of kmemdup
    Date
    [ Upstream commit fd21b79e541e4666c938a344f3ad2df74b4f5120 ]

    uuid in add_switch is allocted via kmemdup which can fail. The patch
    logs the error and cleans up the allocated memory for switch.

    Signed-off-by: Aditya Pakki <pakki001@umn.edu>
    Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
    Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/thunderbolt/icm.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
    index 28fc4ce75edb4..8490a1b6b6156 100644
    --- a/drivers/thunderbolt/icm.c
    +++ b/drivers/thunderbolt/icm.c
    @@ -476,6 +476,11 @@ static void add_switch(struct tb_switch *parent_sw, u64 route,
    goto out;

    sw->uuid = kmemdup(uuid, sizeof(*uuid), GFP_KERNEL);
    + if (!sw->uuid) {
    + tb_sw_warn(sw, "cannot allocate memory for switch\n");
    + tb_switch_put(sw);
    + goto out;
    + }
    sw->connection_id = connection_id;
    sw->connection_key = connection_key;
    sw->link = link;
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-05-30 05:26    [W:4.809 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site