From: Xichao Zhao <zhao.xichao@vivo.com>
Date: Fri, 29 Aug 2025 09:15:10 +0000 (+0800)
Subject: fs: Replace offsetof() with struct_size() in ioctl_file_dedupe_range()
X-Git-Tag: v6.18-rc1~242^2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=38d1227fa71d96b470172df50e241775a802a8e7;p=thirdparty%2Fkernel%2Fstable.git

fs: Replace offsetof() with struct_size() in ioctl_file_dedupe_range()

When dealing with structures containing flexible arrays, struct_size()
provides additional compile-time checks compared to offsetof(). This
enhances code robustness and reduces the risk of potential errors.

Signed-off-by: Xichao Zhao <zhao.xichao@vivo.com>
Link: https://lore.kernel.org/20250829091510.597858-1-zhao.xichao@vivo.com
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Christian Brauner <brauner@kernel.org>
---

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 0248cb8db2d36..83d07218b6cd0 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -426,7 +426,7 @@ static int ioctl_file_dedupe_range(struct file *file,
 		goto out;
 	}
 
-	size = offsetof(struct file_dedupe_range, info[count]);
+	size = struct_size(same, info, count);
 	if (size > PAGE_SIZE) {
 		ret = -ENOMEM;
 		goto out;