From: Miklos Szeredi <mszeredi@redhat.com>
Date: Mon, 14 Dec 2020 14:26:13 +0000 (+0100)
Subject: vfs: verify source area in vfs_dedupe_file_range_one()
X-Git-Tag: v5.15~2136^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3078d85c9a1099405a0463c4d112ba97ee5bd217;p=platform%2Fkernel%2Flinux-starfive.git

vfs: verify source area in vfs_dedupe_file_range_one()

Call remap_verify_area() on the source file as well as the destination.

When called from vfs_dedupe_file_range() the check as already been
performed, but not so if called from layered fs (overlayfs, etc...)

Could ommit the redundant check in vfs_dedupe_file_range(), but leave for
now to get error early (for fear of breaking backward compatibility).

This call shouldn't be performance sensitive.

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---

diff --git a/fs/remap_range.c b/fs/remap_range.c
index e6099be..77dba3a 100644
--- a/fs/remap_range.c
+++ b/fs/remap_range.c
@@ -456,8 +456,16 @@ loff_t vfs_dedupe_file_range_one(struct file *src_file, loff_t src_pos,
 	if (ret)
 		return ret;
 
+	/*
+	 * This is redundant if called from vfs_dedupe_file_range(), but other
+	 * callers need it and it's not performance sesitive...
+	 */
+	ret = remap_verify_area(src_file, src_pos, len, false);
+	if (ret)
+		goto out_drop_write;
+
 	ret = remap_verify_area(dst_file, dst_pos, len, true);
-	if (ret < 0)
+	if (ret)
 		goto out_drop_write;
 
 	ret = -EPERM;