Merge branch 'xfs-misc' into for-next
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:
Коммит
dc16b186bb
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче