linux-kernel - [PATCH] fs: Replace offsetof() with struct

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20250829100328.618903-1-zhao.xichao@vivo.com>
Date: Fri, 29 Aug 2025 18:03:28 +0800
From: Xichao Zhao <zhao.xichao@...o.com>
To: viro@...iv.linux.org.uk,
	brauner@...nel.org
Cc: jack@...e.cz,
	linux-fsdevel@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Xichao Zhao <zhao.xichao@...o.com>
Subject: [PATCH] fs: Replace offsetof() with struct_size()

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@...o.com>
---
 fs/namei.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 10f7caff7f0f..70a71b1b8abc 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -178,7 +178,7 @@ getname_flags(const char __user *filename, int flags)
 	 * userland.
 	 */
 	if (unlikely(len == EMBEDDED_NAME_MAX)) {
-		const size_t size = offsetof(struct filename, iname[1]);
+		const size_t size = struct_size(result, iname, 1);
 		kname = (char *)result;
 
 		/*
@@ -253,7 +253,7 @@ struct filename *getname_kernel(const char * filename)
 	if (len <= EMBEDDED_NAME_MAX) {
 		result->name = (char *)result->iname;
 	} else if (len <= PATH_MAX) {
-		const size_t size = offsetof(struct filename, iname[1]);
+		const size_t size = struct_size(result, iname, 1);
 		struct filename *tmp;
 
 		tmp = kmalloc(size, GFP_KERNEL);
-- 
2.34.1