fs/ext[23]/xattr.c pointer arithmetic fix
PATCH 1/1 fs/ext[23]/xattr.c pointer arithmetic fix
Hello,
we just found a 64-bit pointer arithmetic bug in the ext2 and ext3 extended attributes code. The fix is attached; could you please apply...
Thanks,
Signature · 2 lines
Andreas Gruenbacher <[email protected]> SuSE Labs, SuSE Linux AG <http://www.suse.de/>
64-bit pointer arithmetic bug in xattr code
The int offset is not enought to hold the difference between arbitraty pointers on 64-bit machines. Compute the offset of here and last inside HDR(bh) instead.
fs/ext2/xattr.c +5 -3
@@ -617,9 +617,11 @@ bad_block: ext2_error(sb, "ext2_xattr_s goto cleanup;memcpy (header,HDR (bh), bh->b_size); header->h_refcount =cpu_to_le32 (1 ); - offset = (char *)header - bh->b_data; - here =ENTRY ((char *)here + offset); - last =ENTRY ((char *)last + offset); + + offset = (char *)here - bh->b_data; + here =ENTRY ((char *)header + offset); + offset = (char *)last - bh->b_data; + last =ENTRY ((char *)header + offset); } }else {/* Allocate a buffer where we construct the new block. */
fs/ext3/xattr.c +4 -3
@@ -629,9 +629,10 @@ bad_block: ext3_error(sb, "ext3_xattr_s goto cleanup;memcpy (header,HDR (bh), bh->b_size); header->h_refcount =cpu_to_le32 (1 ); - offset = (char *)header - bh->b_data; - here =ENTRY ((char *)here + offset); - last =ENTRY ((char *)last + offset); + offset = (char *)here - bh->b_data; + here =ENTRY ((char *)header + offset); + offset = (char *)last - bh->b_data; + last =ENTRY ((char *)header + offset); } }else {/* Allocate a buffer where we construct the new block. */