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

Commit ba4dbded authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'jfs-4.18' of git://github.com/kleikamp/linux-shaggy 

Pull jfs fix from Dave Kleikamp:
 "This fixes a too-small allocation in the xattr code"

* tag 'jfs-4.18' of git://github.com/kleikamp/linux-shaggy:
  jfs: Fix inconsistency between memory allocation and ea_buf->max_size
parents c0d1a7eb 92d34134

fs/jfs/xattr.c

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