aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShankara Pailoor <shankarapailoor@gmail.com>2018-06-05 09:33:27 -0400
committerDave Kleikamp <dave.kleikamp@oracle.com>2018-06-05 11:36:46 -0400
commit92d34134193e5b129dc24f8d79cb9196626e8d7a (patch)
tree011dce3db1fdefac39464c1a9be0a5412926ad51
parent716a685fdb89942a50c4138141027e38336a895f (diff)
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. Signed-off-by: Shankara Pailoor <shankarapailoor@gmail.com> Signed-off-by: Dave Kleikamp <dave.kleikamp@oracle.com>
-rw-r--r--fs/jfs/xattr.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index c60f3d32ee91..a6797986b625 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)
491 if (size > PSIZE) { 491 if (size > PSIZE) {
492 /* 492 /*
493 * To keep the rest of the code simple. Allocate a 493 * To keep the rest of the code simple. Allocate a
494 * contiguous buffer to work with 494 * contiguous buffer to work with. Make the buffer large
495 * enough to make use of the whole extent.
495 */ 496 */
496 ea_buf->xattr = kmalloc(size, GFP_KERNEL); 497 ea_buf->max_size = (size + sb->s_blocksize - 1) &
498 ~(sb->s_blocksize - 1);
499
500 ea_buf->xattr = kmalloc(ea_buf->max_size, GFP_KERNEL);
497 if (ea_buf->xattr == NULL) 501 if (ea_buf->xattr == NULL)
498 return -ENOMEM; 502 return -ENOMEM;
499 503
500 ea_buf->flag = EA_MALLOC; 504 ea_buf->flag = EA_MALLOC;
501 ea_buf->max_size = (size + sb->s_blocksize - 1) &
502 ~(sb->s_blocksize - 1);
503 505
504 if (ea_size == 0) 506 if (ea_size == 0)
505 return 0; 507 return 0;