Skip to content

Commit d3a2b6b

Browse files
GustavoARSilvajgross1
authored andcommitted
xen/xenbus: Add __counted_by for struct read_buffer 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> Reviewed-by: Jason Andryuk <jandryuk@gmail.com> Link: https://lore.kernel.org/r/ZSRMosLuJJS5Y/io@work Signed-off-by: Juergen Gross <jgross@suse.com>
1 parent 44961b8 commit d3a2b6b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/xen/xenbus/xenbus_dev_frontend.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ struct read_buffer {
8282
struct list_head list;
8383
unsigned int cons;
8484
unsigned int len;
85-
char msg[];
85+
char msg[] __counted_by(len);
8686
};
8787

8888
struct xenbus_file_priv {
@@ -195,7 +195,7 @@ static int queue_reply(struct list_head *queue, const void *data, size_t len)
195195
if (len > XENSTORE_PAYLOAD_MAX)
196196
return -EINVAL;
197197

198-
rb = kmalloc(sizeof(*rb) + len, GFP_KERNEL);
198+
rb = kmalloc(struct_size(rb, msg, len), GFP_KERNEL);
199199
if (rb == NULL)
200200
return -ENOMEM;
201201

0 commit comments

Comments
 (0)