From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 27 Mar 2018 08:30:39 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v4.15.14~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1d416a6dbb582503248988cfa04e663e2b93f5e;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch
---

diff --git a/queue-4.4/series b/queue-4.4/series
index 8e88df0fae7..e7501efa0b5 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -37,3 +37,4 @@ x86-build-64-force-the-linker-to-use-2mb-page-size.patch
 x86-boot-64-verify-alignment-of-the-load-segment.patch
 x86-entry-64-don-t-use-ist-entry-for-bp-stack.patch
 perf-x86-intel-don-t-accidentally-clear-high-bits-in-bdw_limit_period.patch
+staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch
diff --git a/queue-4.4/staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch b/queue-4.4/staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch
new file mode 100644
index 00000000000..f8323318111
--- /dev/null
+++ b/queue-4.4/staging-lustre-ptlrpc-kfree-used-instead-of-kvfree.patch
@@ -0,0 +1,40 @@
+From c3eec59659cf25916647d2178c541302bb4822ad Mon Sep 17 00:00:00 2001
+From: Nadav Amit <namit@vmware.com>
+Date: Tue, 5 Sep 2017 20:25:25 +0000
+Subject: staging: lustre: ptlrpc: kfree used instead of kvfree
+
+From: Nadav Amit <namit@vmware.com>
+
+commit c3eec59659cf25916647d2178c541302bb4822ad upstream.
+
+rq_reqbuf is allocated using kvmalloc() but released in one occasion
+using kfree() instead of kvfree().
+
+The issue was found using grep based on a similar bug.
+
+Fixes: d7e09d0397e8 ("add Lustre file system client support")
+Fixes: ee0ec1946ec2 ("lustre: ptlrpc: Replace uses of OBD_{ALLOC,FREE}_LARGE")
+
+Cc: Peng Tao <bergwolf@gmail.com>
+Cc: Oleg Drokin <oleg.drokin@intel.com>
+Cc: James Simmons <jsimmons@infradead.org>
+
+Signed-off-by: Nadav Amit <namit@vmware.com>
+Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/staging/lustre/lustre/ptlrpc/sec.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/staging/lustre/lustre/ptlrpc/sec.c
++++ b/drivers/staging/lustre/lustre/ptlrpc/sec.c
+@@ -824,7 +824,7 @@ void sptlrpc_request_out_callback(struct
+ 	if (req->rq_pool || !req->rq_reqbuf)
+ 		return;
+ 
+-	kfree(req->rq_reqbuf);
++	kvfree(req->rq_reqbuf);
+ 	req->rq_reqbuf = NULL;
+ 	req->rq_reqbuf_len = 0;
+ }