jfs: CVE-2018-12233

jfs: Fix inconsistency between memory allocation and ea_buf->max_size

References:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.9.y&id=240d46556d5961c7100febbee0e058185b3c8d4f

Signed-off-by: Andreas Wellving <andreas.wellving@enea.com>

Change-Id: I5aa9f19c9e63cf4ea1f312f9ae6438f0f512977b

2 files changed, 51 insertions, 0 deletions

diff --git a/patches/cve/4.9.x.scc b/patches/cve/4.9.x.scc
index 0840cbd..b5fb15d 100644
--- a/patches/cve/4.9.x.scc
+++ b/patches/cve/4.9.x.scc
@@ -40,3 +40,6 @@ patch CVE-2018-13405-Fix-up-non-directory-creation-in-SGID-directories.patch
 
 #CVEs fixed in 4.9.116:
 patch CVE-2018-5390-tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch 
+
+#CVEs fixed in 4.9.119:
+patch CVE-2018-12233-jfs-Fix-inconsistency-between-memory-allocation-and-.patch
diff --git a/patches/cve/CVE-2018-12233-jfs-Fix-inconsistency-between-memory-allocation-and-.patch b/patches/cve/CVE-2018-12233-jfs-Fix-inconsistency-between-memory-allocation-and-.patch
new file mode 100644
index 0000000..4b4ce0e
--- /dev/null
+++ b/patches/cve/CVE-2018-12233-jfs-Fix-inconsistency-between-memory-allocation-and-.patch
@@ -0,0 +1,48 @@
+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: [PATCH] jfs: Fix inconsistency between memory allocation and
+ ea_buf->max_size
+
+The code is assuming the buffer is max_size length, but we weren't
+allocating enough space for it.
+
+CVE: CVE-2018-12233   
+Upstream-Status: Backport  
+
+Signed-off-by: Shankara Pailoor <shankarapailoor@gmail.com>
+Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
+Signed-off-by: Andreas Wellving <andreas.wellving@enea.com>
+---
+ fs/jfs/xattr.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
+index c60f3d3..a679798 100644
+--- a/fs/jfs/xattr.c
++++ b/fs/jfs/xattr.c
+@@ -491,15 +491,17 @@ static int ea_get(struct inode *inode, struct ea_buffer *ea_buf, int min_size)
+        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;
+-- 
+
+