4.14-stable patches

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

diff --git a/queue-4.14/jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch b/queue-4.14/jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch
new file mode 100644 (file)
index 0000000..0bb2a85
--- /dev/null
+++ b/queue-4.14/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.14/series b/queue-4.14/series
index 8380ea2b12131f38c4cd8922be58391892b23dec..87db8cedeb62abdb5066a26c6a0babb288c68f18 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -18,3 +18,4 @@ intel_idle-graceful-probe-failure-when-mwait-is-disabled.patch
 xfs-catch-inode-allocation-state-mismatch-corruption.patch
 xfs-validate-cached-inodes-are-free-when-allocated.patch
 xfs-don-t-call-xfs_da_shrink_inode-with-null-bp.patch
+jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch