From: Sasha Levin <sashal@kernel.org>
Date: Thu, 1 Nov 2018 16:00:09 +0000 (-0400)
Subject: queue drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch for 4.14
X-Git-Tag: v4.19.1~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=47d821f0a0cabaee400ae106462736064d5daa77;p=thirdparty%2Fkernel%2Fstable-queue.git

queue drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.14/drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch b/queue-4.14/drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch
new file mode 100644
index 00000000000..3ee29aebe78
--- /dev/null
+++ b/queue-4.14/drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch
@@ -0,0 +1,39 @@
+From bdf0ca956d0f82a47d167dce0805c7424281e44a Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Tue, 10 Apr 2018 13:33:12 +0100
+Subject: drm/i915/gvt: fix memory leak of a cmd_entry struct on error exit
+ path
+
+commit ffdf16edfbbe77f5f5c3c87fe8d7387ecd16241b upstream
+
+The error exit path when a duplicate is found does not kfree and cmd_entry
+struct and hence there is a small memory leak.  Fix this by kfree'ing it.
+
+Detected by CoverityScan, CID#1370198 ("Resource Leak")
+
+Fixes: be1da7070aea ("drm/i915/gvt: vGPU command scanner")
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
+Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Acked-by: Zhenyu Wang <zhenyuw@linux.intel.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
+index d4726a3358a4..d6993c2707d1 100644
+--- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
++++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
+@@ -2802,6 +2802,7 @@ static int init_cmd_table(struct intel_gvt *gvt)
+ 		if (info) {
+ 			gvt_err("%s %s duplicated\n", e->info->name,
+ 					info->name);
++			kfree(e);
+ 			return -EEXIST;
+ 		}
+ 
+-- 
+2.17.1
+
diff --git a/queue-4.14/series b/queue-4.14/series
index 0073ce0b7df..64432d05062 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -111,3 +111,4 @@ media-uvcvideo-fix-driver-reference-counting.patch
 alsa-usx2y-fix-invalid-stream-urbs.patch
 revert-netfilter-ipv6-nf_defrag-drop-skb-dst-before-.patch
 perf-tools-disable-parallelism-for-make-clean.patch
+drm-i915-gvt-fix-memory-leak-of-a-cmd_entry-struct-o.patch