Commit 7e01c8e5 authored May 14, 2008 by Tiger Yang Committed by Linus Torvalds May 14, 2008

ext3/4: fix uninitialized bs in ext3/4_xattr_set_handle()



This fix the uninitialized bs when we try to replace a xattr entry in
ibody with the new value which require more than free space.

This situation only happens we format ext3/4 with inode size more than 128 and
we have put xattr entries both in ibody and block.  The consequences about
this bug is we will lost the xattr block which pointed by i_file_acl with all
xattr entires in it.  We will alloc a new xattr block and put that large value
entry in it.  The old xattr block will become orphan block.

Signed-off-by: Tiger Yang <tiger.yang@oracle.com>
Cc: <linux-ext4@vger.kernel.org>
Cc: Andreas Gruenbacher <agruen@suse.de>
Acked-by: Andreas Dilger <adilger@sun.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 0c70814c

fs/ext3/xattr.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1000,6 +1000,11 @@ ext3_xattr_set_handle(handle_t handle, struct inode inode, int name_index,
		i.value = NULL;
		error = ext3_xattr_block_set(handle, inode, &i, &bs);
		} else if (error == -ENOSPC) {
		if (EXT3_I(inode)->i_file_acl && !bs.s.base) {
		error = ext3_xattr_block_find(inode, &i, &bs);
		if (error)
		goto cleanup;
		}
		error = ext3_xattr_block_set(handle, inode, &i, &bs);
		if (error)
		goto cleanup;

fs/ext4/xattr.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1009,6 +1009,11 @@ ext4_xattr_set_handle(handle_t handle, struct inode inode, int name_index,
		i.value = NULL;
		error = ext4_xattr_block_set(handle, inode, &i, &bs);
		} else if (error == -ENOSPC) {
		if (EXT4_I(inode)->i_file_acl && !bs.s.base) {
		error = ext4_xattr_block_find(inode, &i, &bs);
		if (error)
		goto cleanup;
		}
		error = ext4_xattr_block_set(handle, inode, &i, &bs);
		if (error)
		goto cleanup;

Admin message