Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31430f2b authored by Shankara Pailoor's avatar Shankara Pailoor Committed by Greg Kroah-Hartman
Browse files

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



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: default avatarShankara Pailoor <shankarapailoor@gmail.com>
Signed-off-by: default avatarDave Kleikamp <dave.kleikamp@oracle.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fed22131

fs/jfs/xattr.c

+6 −4
Original line number Diff line number Diff line
@@ -493,15 +493,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;