Commit e2bc4470 authored Jan 11, 2014 by Linus Torvalds

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

parents 324c66ff 1f4a63bf

fs/xfs/xfs_attr_remote.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ xfs_attr3_rmt_verify(
		if (be32_to_cpu(rmt->rm_bytes) > fsbsize - sizeof(*rmt))
		return false;
		if (be32_to_cpu(rmt->rm_offset) +
		be32_to_cpu(rmt->rm_bytes) >= XATTR_SIZE_MAX)
		be32_to_cpu(rmt->rm_bytes) > XATTR_SIZE_MAX)
		return false;
		if (rmt->rm_owner == 0)
		return false;

fs/xfs/xfs_bmap_util.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -287,6 +287,7 @@ xfs_bmapi_allocate(
		INIT_WORK_ONSTACK(&args->work, xfs_bmapi_allocate_worker);
		queue_work(xfs_alloc_wq, &args->work);
		wait_for_completion(&done);
		destroy_work_on_stack(&args->work);
		return args->result;
		}