提交 8391d72e 编写于 作者: D Dave Chinner 提交者: Zheng Zengkai

fs/remap: constrain dedupe of EOF blocks

stable inclusion
from stable-v5.10.132
commit 14e63942d63e278d271aac211476b81b2c60aaf6
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5YS3T

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=14e63942d63e278d271aac211476b81b2c60aaf6

--------------------------------

commit 5750676b upstream.

If dedupe of an EOF block is not constrainted to match against only
other EOF blocks with the same EOF offset into the block, it can
match against any other block that has the same matching initial
bytes in it, even if the bytes beyond EOF in the source file do
not match.

Fix this by constraining the EOF block matching to only match
against other EOF blocks that have identical EOF offsets and data.
This allows "whole file dedupe" to continue to work without allowing
eof blocks to randomly match against partial full blocks with the
same data.
Reported-by: NAnsgar Lößer <ansgar.loesser@tu-darmstadt.de>
Fixes: 1383a7ed ("vfs: check file ranges before cloning files")
Link: https://lore.kernel.org/linux-fsdevel/a7c93559-4ba1-df2f-7a85-55a143696405@tu-darmstadt.de/Signed-off-by: NDave Chinner <dchinner@redhat.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>
上级 7c37f793
...@@ -71,7 +71,8 @@ static int generic_remap_checks(struct file *file_in, loff_t pos_in, ...@@ -71,7 +71,8 @@ static int generic_remap_checks(struct file *file_in, loff_t pos_in,
* Otherwise, make sure the count is also block-aligned, having * Otherwise, make sure the count is also block-aligned, having
* already confirmed the starting offsets' block alignment. * already confirmed the starting offsets' block alignment.
*/ */
if (pos_in + count == size_in) { if (pos_in + count == size_in &&
(!(remap_flags & REMAP_FILE_DEDUP) || pos_out + count == size_out)) {
bcount = ALIGN(size_in, bs) - pos_in; bcount = ALIGN(size_in, bs) - pos_in;
} else { } else {
if (!IS_ALIGNED(count, bs)) if (!IS_ALIGNED(count, bs))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册