dm crypt: Annotate struct crypt_config with __counted_by
PATCH 1/1 dm crypt: Annotate struct crypt_config 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 crypt_config.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
--- drivers/md/dm-crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-crypt.c +1 -1
@@ -224,7 +224,7 @@ struct crypt_config {struct mutex bio_alloc_lock;u8 *authenc_key;/* space for keys in authenc() format (if used) */ -u8 key[]; + u8 key[] __counted_by(key_size); };#define MIN_IOS 64
Signature · 1 line
2.34.1
Quoted 6 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).
Quoted 8 lines
As found with Coccinelle[1], add
__counted_byfor structcrypt_config.[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc Alasdair Kergon <[email protected]>Cc Mike Snitzer <[email protected]>Signed-off-by Kees Cook <[email protected]>
Thanks
Signature · 1 line
Gustavo
Quoted 17 lines
--- drivers/md/dm-crypt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/md/dm-crypt.c +1
-1@@ -224,7 +224,7 @@ struct crypt_config {struct mutex bio_alloc_lock;u8 *authenc_key;/* space for keys in authenc() format (if used) */ -u8 key[]; + u8 key[] __counted_by(key_size); };#define MIN_IOS 64
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 structcrypt_config.[...]
Applied to for-next/hardening, thanks!
[1/1] dm crypt: Annotate struct crypt_config with __counted_by
https://git.kernel.org/kees/c/6797f1750c3c
Take care,
Signature · 1 line
Kees Cook