]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
committerStefan Bader <stefan.bader@canonical.com>
Tue, 13 Aug 2019 12:11:36 +0000 (14:11 +0200)
BugLink: https://bugs.launchpad.net/bugs/1837517
[ 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>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
drivers/thunderbolt/icm.c

index e3fc920af68252e51b6d52774c9b2eb44b52dfcf..8b7f9131e9d1200e4652c0878ae2b44896db6e75 100644 (file)
@@ -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;