[merged] reiserfs-fix-corruption-during-shrinking-of-xattrs.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     reiserfs: fix corruption during shrinking of xattrs
has been removed from the -mm tree.  Its filename was
     reiserfs-fix-corruption-during-shrinking-of-xattrs.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: reiserfs: fix corruption during shrinking of xattrs
From: Jeff Mahoney <jeffm@xxxxxxxx>

Commit 48b32a3553a54740d236b79a90f20147a25875e3 ("reiserfs: use generic
xattr handlers") introduced a problem that causes corruption when extended
attributes are replaced with a smaller value.

The issue is that the reiserfs_setattr to shrink the xattr file was moved
from before the write to after the write.

The root issue has always been in the reiserfs xattr code, but was papered
over by the fact that in the shrink case, the file would just be expanded
again while the xattr was written.

The end result is that the last 8 bytes of xattr data are lost.

This patch fixes it to use new_size.

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=14826

Signed-off-by: Jeff Mahoney <jeffm@xxxxxxxx>
Reported-by: Christian Kujau <lists@xxxxxxxxxxxxxxx>
Tested-by: Christian Kujau <lists@xxxxxxxxxxxxxxx>
Cc: Edward Shishkin <edward.shishkin@xxxxxxxxx>
Cc: Jethro Beekman <kernel@xxxxxxxxxxx>
Cc: Greg Surbey <gregsurbey@xxxxxxxxxxx>
Cc: Marco Gatti <marco.gatti@xxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 fs/reiserfs/xattr.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/reiserfs/xattr.c~reiserfs-fix-corruption-during-shrinking-of-xattrs fs/reiserfs/xattr.c
--- a/fs/reiserfs/xattr.c~reiserfs-fix-corruption-during-shrinking-of-xattrs
+++ a/fs/reiserfs/xattr.c
@@ -554,7 +554,7 @@ reiserfs_xattr_set_handle(struct reiserf
 	if (!err && new_size < i_size_read(dentry->d_inode)) {
 		struct iattr newattrs = {
 			.ia_ctime = current_fs_time(inode->i_sb),
-			.ia_size = buffer_size,
+			.ia_size = new_size,
 			.ia_valid = ATTR_SIZE | ATTR_CTIME,
 		};
 
_

Patches currently in -mm which might be from jeffm@xxxxxxxx are

origin.patch
linux-next.patch
buffer_head-remove-redundant-test-from-wait_on_buffer.patch
buffer_head-remove-redundant-test-from-wait_on_buffer-fix.patch
wait_on_buffer-remove-the-buffer_locked-test.patch
delayacct-align-to-8-byte-boundary-on-64-bit-systems.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux