Skip to contentSkip to conversation

fs/xattr: Annotate struct simple_xattr with __counted_by

PATCH RESEND Applied Thorsten Blum 2 participants 2 messages Jan 5 – Jan 12

lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 fs/xattr: Annotate struct simple_xattr with __counted_by

Add the __counted_by() compiler attribute to the flexible array member 'value' to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and CONFIG_FORTIFY_SOURCE.

---
 include/linux/xattr.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/xattr.h +1 -1
index 64e9afe7d647..296b5ee5c979 100644
@@ -114,7 +114,7 @@ struct simple_xattr {
 	struct rb_node rb_node;
 	char *name;
 	size_t size;
-	char value[];
+	char value[] __counted_by(size);
 };
 
 void simple_xattrs_init(struct simple_xattrs *xattrs);
Signature · 2 lines
Thorsten Blum <[email protected]>
GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4
Applied
#1 lore raw
Quoted 5 lines · Thorsten Blum

Add the __counted_by() compiler attribute to the flexible array member 'value' to improve access bounds-checking via CONFIG_UBSAN_BOUNDS and CONFIG_FORTIFY_SOURCE.

Applied to for-next/hardening, thanks!

[1/1] fs/xattr: Annotate struct simple_xattr with __counted_by

      https://git.kernel.org/kees/c/f2c5457dadec

Take care,

Signature · 1 line
Kees Cook