korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 06:24:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xfs-misc' into for-next

Browse Source 
A bugfix for an off-by-one in the remote attribute verifier, and a fix for a
missing destroy_work_on_stack() in the allocation worker.
This commit is contained in:
Ben Myers 2014-01-09 15:58:59 -06:00
commit dc16b186bb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/xfs/xfs_attr_remote.c
View File

@ -110,7 +110,7 @@ xfs_attr3_rmt_verify(
if (be32_to_cpu(rmt->rm_bytes) > fsbsize - sizeof(*rmt)) if (be32_to_cpu(rmt->rm_bytes) > fsbsize - sizeof(*rmt))
return false; return false;
if (be32_to_cpu(rmt->rm_offset) + 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; return false;
if (rmt->rm_owner == 0) if (rmt->rm_owner == 0)
return false; return false;

1
fs/xfs/xfs_bmap_util.c
View File

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