thunderbolt: Fix to check the return value of kmemdup
authorAditya Pakki <pakki001@umn.edu>
Mon, 25 Mar 2019 21:25:22 +0000 (16:25 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 31 May 2019 13:46:29 +0000 (06:46 -0700)
[ 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

index 28fc4ce..8490a1b 100644 (file)
@@ -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;