Skip to content

Commit e2bc447

Browse files
committed
Merge tag 'xfs-for-linus-v3.13-rc8' of git://oss.sgi.com/xfs/xfs
Pull xfs bugfixes from Ben Myers: "Here we have a bugfix for an off-by-one in the remote attribute verifier that results in a forced shutdown which you can hit with v5 superblock by creating a 64k xattr, and a fix for a missing destroy_work_on_stack() in the allocation worker. It's a bit late, but they are both fairly straightforward" * tag 'xfs-for-linus-v3.13-rc8' of git://oss.sgi.com/xfs/xfs: xfs: Calling destroy_work_on_stack() to pair with INIT_WORK_ONSTACK() xfs: fix off-by-one error in xfs_attr3_rmt_verify
2 parents 324c66f + 1f4a63b commit e2bc447

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

fs/xfs/xfs_attr_remote.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ xfs_attr3_rmt_verify(
110110
if (be32_to_cpu(rmt->rm_bytes) > fsbsize - sizeof(*rmt))
111111
return false;
112112
if (be32_to_cpu(rmt->rm_offset) +
113-
be32_to_cpu(rmt->rm_bytes) >= XATTR_SIZE_MAX)
113+
be32_to_cpu(rmt->rm_bytes) > XATTR_SIZE_MAX)
114114
return false;
115115
if (rmt->rm_owner == 0)
116116
return false;

fs/xfs/xfs_bmap_util.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ xfs_bmapi_allocate(
287287
INIT_WORK_ONSTACK(&args->work, xfs_bmapi_allocate_worker);
288288
queue_work(xfs_alloc_wq, &args->work);
289289
wait_for_completion(&done);
290+
destroy_work_on_stack(&args->work);
290291
return args->result;
291292
}
292293

0 commit comments

Comments
 (0)