Skip to contentSkip to conversation

ovl: Replace offsetof() with struct_size() in ovl_stack_free()

PATCH Applied Thorsten Blum 2 participants 2 messages May 3, 2025 – May 5, 2025 Overlay filesystem

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ovl: Replace offsetof() with struct_size() in ovl_stack_free()

Compared to offsetof(), struct_size() provides additional compile-time checks for structs with flexible arrays (e.g., __must_be_array()).

No functional changes intended.

---
Changes in v2:
- Add missing include
- Link to v1: https://lore.kernel.org/lkml/[email protected]/

---
 fs/overlayfs/util.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/overlayfs/util.c +3 -2
index 0819c739cc2f..e33d2257c642 100644
@@ -15,6 +15,7 @@
 #include <linux/uuid.h>
 #include <linux/namei.h>
 #include <linux/ratelimit.h>
+#include <linux/overflow.h>
 #include "overlayfs.h"
 
 /* Get write access to upper mnt - may fail if upper sb was remounted ro */
@@ -145,9 +146,9 @@ void ovl_stack_free(struct ovl_path *stack, unsigned int n)
 
 struct ovl_entry *ovl_alloc_entry(unsigned int numlower)
 {
-	size_t size = offsetof(struct ovl_entry, __lowerstack[numlower]);
-	struct ovl_entry *oe = kzalloc(size, GFP_KERNEL);
+	struct ovl_entry *oe;
 
+	oe = kzalloc(struct_size(oe, __lowerstack, numlower), GFP_KERNEL);
 	if (oe)
 		oe->__numlower = numlower;
 
Signature · 1 line
2.49.0
maintainer Applied
#1 lore raw
Quoted 7 lines · Thorsten Blum

Compared to offsetof(), struct_size() provides additional compile-time checks for structs with flexible arrays (e.g., __must_be_array()).

No functional changes intended.

Applied, thanks.

Miklos