| From c36510094fd3c24ec838921ce1d91af54f8eee06 Mon Sep 17 00:00:00 2001 |
| From: Aditya Pakki <pakki001@umn.edu> |
| Date: Mon, 25 Mar 2019 16:25:22 -0500 |
| Subject: thunderbolt: Fix to check the return value of kmemdup |
| |
| [ 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 e3fc920af6825..8b7f9131e9d12 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; |
| -- |
| 2.20.1 |
| |