From: Greg Kroah-Hartman Date: Tue, 7 Aug 2018 17:20:51 +0000 (+0200) Subject: 3.18-stable patches X-Git-Tag: v4.17.14~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a0e1291d9b2983a5a641421ee611ee76a8e552ea;p=thirdparty%2Fkernel%2Fstable-queue.git 3.18-stable patches added patches: jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch --- diff --git a/queue-3.18/jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch b/queue-3.18/jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch new file mode 100644 index 00000000000..610647e6317 --- /dev/null +++ b/queue-3.18/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 +Date: Tue, 5 Jun 2018 08:33:27 -0500 +Subject: jfs: Fix inconsistency between memory allocation and ea_buf->max_size + +From: Shankara Pailoor + +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 +Signed-off-by: Dave Kleikamp +Cc: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman + +--- + fs/jfs/xattr.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/fs/jfs/xattr.c ++++ b/fs/jfs/xattr.c +@@ -493,15 +493,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-3.18/series b/queue-3.18/series index 856978630ae..270b0d5268f 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -82,3 +82,4 @@ scsi-sg-fix-minor-memory-leak-in-error-path.patch scsi-qla2xxx-fix-isp-recovery-on-unload.patch scsi-qla2xxx-return-error-when-tmf-returns.patch ring_buffer-tracing-inherit-the-tracing-setting-to-next-ring-buffer.patch +jfs-fix-inconsistency-between-memory-allocation-and-ea_buf-max_size.patch