summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-15 19:15:20 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2019-08-15 19:15:20 -0400
commit735d2653589a4da8e6f88517a69c2aa013a5bcf3 (patch)
tree911fdf382bad1836590cbbe67b575f896aa1c68b
parent862e53126535fae47675c8b4cfcd0326a25193c3 (diff)
downloadlongterm-queue-4.18-735d2653589a4da8e6f88517a69c2aa013a5bcf3.tar.gz
thunderbolt: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/thunderbolt-Fix-to-check-the-return-value-of-kmemdup.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/queue/thunderbolt-Fix-to-check-the-return-value-of-kmemdup.patch b/queue/thunderbolt-Fix-to-check-the-return-value-of-kmemdup.patch
index 4fd0c3b..b85448b 100644
--- a/queue/thunderbolt-Fix-to-check-the-return-value-of-kmemdup.patch
+++ b/queue/thunderbolt-Fix-to-check-the-return-value-of-kmemdup.patch
@@ -1,4 +1,4 @@
-From fd21b79e541e4666c938a344f3ad2df74b4f5120 Mon Sep 17 00:00:00 2001
+From 70dee19627a5fd2a16cb7d422a5ca0d400f5b13e Mon Sep 17 00:00:00 2001
From: Aditya Pakki <pakki001@umn.edu>
Date: Mon, 25 Mar 2019 16:25:22 -0500
Subject: [PATCH] thunderbolt: Fix to check the return value of kmemdup
@@ -13,11 +13,11 @@ Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
-index e3fc920af682..8b7f9131e9d1 100644
+index 5bad9fdec5f8..4a393edd3049 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;
+@@ -421,6 +421,11 @@ static void add_switch(struct tb_switch *parent_sw, u64 route,
+ return;
sw->uuid = kmemdup(uuid, sizeof(*uuid), GFP_KERNEL);
+ if (!sw->uuid) {