Skip to content

Commit 4464256

Browse files
GustavoARSilvakees
authored andcommitted
afs: Add __counted_by for struct afs_acl and use struct_size()
Prepare for the coming implementation by GCC and Clang of the __counted_by attribute. Flexible array members annotated with __counted_by can have their accesses bounds-checked at run-time via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions). While there, use struct_size() helper, instead of the open-coded version, to calculate the size for the allocation of the whole flexible structure, including of course, the flexible-array member. This code was found with the help of Coccinelle, and audited and fixed manually. Signed-off-by: "Gustavo A. R. Silva" <gustavoars@kernel.org> Reviewed-by: Kees Cook <keescook@chromium.org> Link: https://lore.kernel.org/r/ZSVKwBmxQ1amv47E@work Signed-off-by: Kees Cook <keescook@chromium.org>
1 parent 97f3880 commit 4464256

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

fs/afs/internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1116,7 +1116,7 @@ extern void afs_fs_inline_bulk_status(struct afs_operation *);
11161116

11171117
struct afs_acl {
11181118
u32 size;
1119-
u8 data[];
1119+
u8 data[] __counted_by(size);
11201120
};
11211121

11221122
extern void afs_fs_fetch_acl(struct afs_operation *);

fs/afs/xattr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ static bool afs_make_acl(struct afs_operation *op,
7575
{
7676
struct afs_acl *acl;
7777

78-
acl = kmalloc(sizeof(*acl) + size, GFP_KERNEL);
78+
acl = kmalloc(struct_size(acl, data, size), GFP_KERNEL);
7979
if (!acl) {
8080
afs_op_nomem(op);
8181
return false;

0 commit comments

Comments
 (0)