tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

xen/gntalloc: Replace UAPI 1-element array

Without changing the structure size (since it is UAPI), add a proper
flexible array member, and reference it in the kernel so that it will
not be trip the array-bounds sanitizer[1].

Link: https://github.com/KSPP/linux/issues/113 [1]
Cc: Juergen Gross <jgross@suse.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Cc: Gustavo A. R. Silva <gustavoars@kernel.org>
Cc: xen-devel@lists.xenproject.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/20240206170320.work.437-kees@kernel.org
Signed-off-by: Juergen Gross <jgross@suse.com>

authored by

Kees Cook and committed by
Juergen Gross bf580223 b0f2f82c

+5 -2
+1 -1
drivers/xen/gntalloc.c
··· 317 317 rc = -EFAULT; 318 318 goto out_free; 319 319 } 320 - if (copy_to_user(arg->gref_ids, gref_ids, 320 + if (copy_to_user(arg->gref_ids_flex, gref_ids, 321 321 sizeof(gref_ids[0]) * op.count)) { 322 322 rc = -EFAULT; 323 323 goto out_free;
+4 -1
include/uapi/xen/gntalloc.h
··· 31 31 __u64 index; 32 32 /* The grant references of the newly created grant, one per page */ 33 33 /* Variable size, depending on count */ 34 - __u32 gref_ids[1]; 34 + union { 35 + __u32 gref_ids[1]; 36 + __DECLARE_FLEX_ARRAY(__u32, gref_ids_flex); 37 + }; 35 38 }; 36 39 37 40 #define GNTALLOC_FLAG_WRITABLE 1