usb: gadget: f_fs: Annotate struct ffs_buffer with __counted_by
PATCH 1/1 usb: gadget: f_fs: Annotate struct ffs_buffer with __counted_by
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 checking via CONFIG_UBSAN_BOUNDS (for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family functions).
As found with Coccinelle[1], add __counted_by for struct ffs_buffer.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- drivers/usb/gadget/function/f_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/gadget/function/f_fs.c +1 -1
@@ -202,7 +202,7 @@ struct ffs_epfile {struct ffs_buffer {size_t length;char *data; -char storage[]; + char storage[] __counted_by(length); };/* ffs_io_data structure ***************************************************/
Signature · 1 line
2.34.1
Quoted 8 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structffs_buffer.
Quoted 8 lines
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Greg Kroah-Hartman <[email protected]>Cc John Keeping <[email protected]>Cc Udipto Goswami <[email protected]>Cc Linyu Yuan <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
Signature · 1 line
Gustavo
Quoted 17 lines
--- drivers/usb/gadget/function/f_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/usb/gadget/function/f_fs.c +1
-1@@ -202,7 +202,7 @@ struct ffs_epfile {struct ffs_buffer {size_t length;char *data; -char storage[]; + char storage[] __counted_by(length); };/* ffs_io_data structure ***************************************************/
Kees Cook
AppliedQuoted 9 lines · Kees Cook
Prepare for the coming implementation by GCC and Clang of the
__counted_byattribute. Flexible array members annotated with__counted_bycan have their accesses bounds-checked at run-time checking viaCONFIG_UBSAN_BOUNDS(for array indexing) andCONFIG_FORTIFY_SOURCE(for strcpy/memcpy-family functions).As found with Coccinelle[1], add
__counted_byfor structffs_buffer.[...]
Applied to for-next/hardening, thanks!
[1/1] usb: gadget: f_fs: Annotate struct ffs_buffer with __counted_by
https://git.kernel.org/kees/c/84657a30a0c9
Take care,
Signature · 1 line
Kees Cook