summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAditya Pakki <pakki001@umn.edu>2019-03-25 16:25:22 -0500
committerMika Westerberg <mika.westerberg@linux.intel.com>2019-03-28 11:33:59 +0300
commitfd21b79e541e4666c938a344f3ad2df74b4f5120 (patch)
treebbca734c0c3ef10fc2d379bf0fb2576a9d289fac
parent6183d5a51866f3acdeeb66b75e87d44025b01a55 (diff)
downloadlinux-fd21b79e541e4666c938a344f3ad2df74b4f5120.tar.gz
linux-fd21b79e541e4666c938a344f3ad2df74b4f5120.tar.bz2
linux-fd21b79e541e4666c938a344f3ad2df74b4f5120.zip
thunderbolt: Fix to check the return value of kmemdup
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>
-rw-r--r--drivers/thunderbolt/icm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index e3fc920af682..8b7f9131e9d1 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -473,6 +473,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;