diff options
| author | Gustavo A. R. Silva <gustavoars@kernel.org> | 2023-10-10 14:59:44 +0200 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2023-12-01 18:51:43 +0100 |
| commit | 446425648c5d19ff7564923863538e9fae93e916 (patch) | |
| tree | 9cfc5f45dbf0587adc9ff796b1a4a54ca5af6264 /fs/afs | |
| parent | VMCI: Annotate struct vmci_handle_arr with __counted_by (diff) | |
| download | linux-446425648c5d19ff7564923863538e9fae93e916.tar.xz linux-446425648c5d19ff7564923863538e9fae93e916.zip | |
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>
Diffstat (limited to 'fs/afs')
| -rw-r--r-- | fs/afs/internal.h | 2 | ||||
| -rw-r--r-- | fs/afs/xattr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/afs/internal.h b/fs/afs/internal.h index c9cef3782b4a..9d6f1aa65776 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -1116,7 +1116,7 @@ extern void afs_fs_inline_bulk_status(struct afs_operation *); struct afs_acl { u32 size; - u8 data[]; + u8 data[] __counted_by(size); }; extern void afs_fs_fetch_acl(struct afs_operation *); diff --git a/fs/afs/xattr.c b/fs/afs/xattr.c index 64b2c0224f62..e19f396aa370 100644 --- a/fs/afs/xattr.c +++ b/fs/afs/xattr.c @@ -75,7 +75,7 @@ static bool afs_make_acl(struct afs_operation *op, { struct afs_acl *acl; - acl = kmalloc(sizeof(*acl) + size, GFP_KERNEL); + acl = kmalloc(struct_size(acl, data, size), GFP_KERNEL); if (!acl) { afs_op_nomem(op); return false; |