From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 7 Aug 2018 17:21:51 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v4.17.14~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3804207ac75384ce122eb561dfc377dd8e95d3c3;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch
---

diff --git a/queue-4.9/jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch b/queue-4.9/jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch
new file mode 100644
index 00000000000..0bb2a8574ed
--- /dev/null
+++ b/queue-4.9/jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch
@@ -0,0 +1,45 @@
+From 92d34134193e5b129dc24f8d79cb9196626e8d7a Mon Sep 17 00:00:00 2001
+From: Shankara Pailoor <shankarapailoor@gmail.com>
+Date: Tue, 5 Jun 2018 08:33:27 -0500
+Subject: jfs: Fix inconsistency between memory allocation and ea_buf->max_size
+
+From: Shankara Pailoor <shankarapailoor@gmail.com>
+
+commit 92d34134193e5b129dc24f8d79cb9196626e8d7a upstream.
+
+The code is assuming the buffer is max_size length, but we weren't
+allocating enough space for it.
+
+Signed-off-by: Shankara Pailoor <shankarapailoor@gmail.com>
+Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/jfs/xattr.c |   10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+--- a/fs/jfs/xattr.c
++++ b/fs/jfs/xattr.c
+@@ -491,15 +491,17 @@ static int ea_get(struct inode *inode, s
+ 	if (size > PSIZE) {
+ 		/*
+ 		 * To keep the rest of the code simple.  Allocate a
+-		 * contiguous buffer to work with
++		 * contiguous buffer to work with. Make the buffer large
++		 * enough to make use of the whole extent.
+ 		 */
+-		ea_buf->xattr = kmalloc(size, GFP_KERNEL);
++		ea_buf->max_size = (size + sb->s_blocksize - 1) &
++		    ~(sb->s_blocksize - 1);
++
++		ea_buf->xattr = kmalloc(ea_buf->max_size, GFP_KERNEL);
+ 		if (ea_buf->xattr == NULL)
+ 			return -ENOMEM;
+ 
+ 		ea_buf->flag = EA_MALLOC;
+-		ea_buf->max_size = (size + sb->s_blocksize - 1) &
+-		    ~(sb->s_blocksize - 1);
+ 
+ 		if (ea_size == 0)
+ 			return 0;
diff --git a/queue-4.9/series b/queue-4.9/series
index e009b9088c3..5354f222d9d 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -14,3 +14,4 @@ tcp-add-tcp_ooo_try_coalesce-helper.patch
 kmemleak-clear-stale-pointers-from-task-stacks.patch
 fork-unconditionally-clear-stack-on-fork.patch
 ib-hfi1-fix-incorrect-mixing-of-err_ptr-and-null-return-values.patch
+jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch