Skip to contentSkip to conversation

Incorrect increment of i_blocks when keeping the same xattr block on ext[23]

PATCH New Andreas Gruenbacher 1 participant 1 message Feb 4, 2004 ext2 file system

lore
Share & tools
lore

Andreas Gruenbacher

author
#0 lore raw

PATCH 1/1 Incorrect increment of i_blocks when keeping the same xattr block on ext[23]

Hello Andrew,

here is a fix for extended attributes on ext2 and ext3, reported by Stephen Tweedie <[email protected]>. The description is in the patch. Could you please apply to mainline?

Thanks,

Signature · 2 lines
Andreas Gruenbacher <[email protected]>
SUSE Labs, SUSE LINUX AG

Incorrect increment of i_blocks when keeping the same xattr block on ext[23]

Quoted 1 line

From Stephen Tweedie <[email protected]>:

When you have an EA block that is shared between multiple inodes; AND you then change an attribute in that on one inode, AND the new attribute value is the same as the old, then xattr computes the new EA block, finds it still in the cache, bumps the reference count on it (and the i_blocks field on the inode, incidentally), and leaves it incremented because we haven't changed EA block so there's no need to drop the refcount on the old block.

So *every* time you have more than one inode sharing an EA block and you perform an identical write to an EA, you get a leak on both i_blocks and the EA refcount.

This is a big problem for symlinks, which rely on correct i_blocks accounting to determine the difference between fast and slow symlinks. With the leak, you end up thinking that a fast symlink (ie. one small enough to be stored in the inode direct blocks) is slow, so you dereference the ascii contents of the symlink as if they were a disk block address. That typically results in EIO all over the place.

fs/ext2/xattr.c +17 -18
Index: linux-2.6.1/fs/ext2/xattr.c
===================================================================
@@ -741,25 +741,24 @@ ext2_xattr_set2(struct inode *inode, str
 	if (header) {
 		new_bh = ext2_xattr_cache_find(inode, header);
 		if (new_bh) {
-			/*
-			 * We found an identical block in the cache. The
-			 * block returned is locked. The old block will
-			 * be released after updating the inode.
-			 */
-			ea_bdebug(new_bh, "%s block %lu",
-				(old_bh == new_bh) ? "keeping" : "reusing",
-				(unsigned long) new_bh->b_blocknr);
-			
-			error = -EDQUOT;
-			if (DQUOT_ALLOC_BLOCK(inode, 1)) {
-				unlock_buffer(new_bh);
-				goto cleanup;
+			/* We found an identical block in the cache. */
+			if (new_bh == old_bh) {
+				ea_bdebug(new_bh, "keeping this block");
+			} else {
+				/* The old block is released after updating
+				   the inode.  */
+				ea_bdebug(new_bh, "reusing block");
+				
+				error = -EDQUOT;
+				if (DQUOT_ALLOC_BLOCK(inode, 1)) {
+					unlock_buffer(new_bh);
+					goto cleanup;
+				}
+				HDR(new_bh)->h_refcount = cpu_to_le32(1 +
+					le32_to_cpu(HDR(new_bh)->h_refcount));
+				ea_bdebug(new_bh, "refcount now=%d",
+					le32_to_cpu(HDR(new_bh)->h_refcount));
 			}
-			
-			HDR(new_bh)->h_refcount = cpu_to_le32(
-				le32_to_cpu(HDR(new_bh)->h_refcount) + 1);
-			ea_bdebug(new_bh, "refcount now=%d",
-				le32_to_cpu(HDR(new_bh)->h_refcount));
 			unlock_buffer(new_bh);
 		} else if (old_bh && header == HDR(old_bh)) {
 			/* Keep this block. No need to lock the block as we
fs/ext3/xattr.c +19 -18
Index: linux-2.6.1/fs/ext3/xattr.c
===================================================================
@@ -753,25 +753,26 @@ ext3_xattr_set_handle2(handle_t *handle,
 	if (header) {
 		new_bh = ext3_xattr_cache_find(handle, inode, header, &credits);
 		if (new_bh) {
-			/*
-			 * We found an identical block in the cache. The
-			 * block returned is locked. The old block will
-			 * be released after updating the inode.
-			 */
-			ea_bdebug(new_bh, "%s block %lu",
-				(old_bh == new_bh) ? "keeping" : "reusing",
-				(unsigned long) new_bh->b_blocknr);
-
-			error = -EDQUOT;
-			if (DQUOT_ALLOC_BLOCK(inode, 1)) {
-				unlock_buffer(new_bh);
-				journal_release_buffer(handle, new_bh, credits);
-				goto cleanup;
+			/* We found an identical block in the cache. */
+			if (new_bh == old_bh)
+				ea_bdebug(new_bh, "keeping this block");
+			else {
+				/* The old block is released after updating
+				   the inode. */
+				ea_bdebug(new_bh, "reusing block");
+
+				error = -EDQUOT;
+				if (DQUOT_ALLOC_BLOCK(inode, 1)) {
+					unlock_buffer(new_bh);
+					journal_release_buffer(handle, new_bh,
+							       credits);
+					goto cleanup;
+				}
+				HDR(new_bh)->h_refcount = cpu_to_le32(1 +
+					le32_to_cpu(HDR(new_bh)->h_refcount));
+				ea_bdebug(new_bh, "refcount now=%d",
+					le32_to_cpu(HDR(new_bh)->h_refcount));
 			}
-			HDR(new_bh)->h_refcount = cpu_to_le32(
-				le32_to_cpu(HDR(new_bh)->h_refcount) + 1);
-			ea_bdebug(new_bh, "refcount now=%d",
-				le32_to_cpu(HDR(new_bh)->h_refcount));
 			unlock_buffer(new_bh);
 		} else if (old_bh && header == HDR(old_bh)) {
 			/* Keep this block. No need to lock the block as we