* [PATCH] dm: Annotate struct dm_bio_prison with __counted_by
@ 2023-09-15 20:04 Kees Cook
2023-09-15 20:32 ` Gustavo A. R. Silva
2023-09-29 19:21 ` Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-15 20:04 UTC (permalink / raw)
To: Alasdair Kergon
Cc: Kees Cook, Mike Snitzer, dm-devel, Nathan Chancellor,
Nick Desaulniers, Tom Rix, linux-kernel, llvm, linux-hardening
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 dm_bio_prison.
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
Cc: Alasdair Kergon <agk@redhat.com>
Cc: Mike Snitzer <snitzer@kernel.org>
Cc: dm-devel@redhat.com
Signed-off-by: Kees Cook <keescook@chromium.org>
---
drivers/md/dm-bio-prison-v1.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/md/dm-bio-prison-v1.c b/drivers/md/dm-bio-prison-v1.c
index 92afdca760ae..9ab32abe5ed4 100644
--- a/drivers/md/dm-bio-prison-v1.c
+++ b/drivers/md/dm-bio-prison-v1.c
@@ -26,7 +26,7 @@ struct prison_region {
struct dm_bio_prison {
mempool_t cell_pool;
unsigned int num_locks;
- struct prison_region regions[];
+ struct prison_region regions[] __counted_by(num_locks);
};
static struct kmem_cache *_cell_cache;
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] dm: Annotate struct dm_bio_prison with __counted_by
2023-09-15 20:04 [PATCH] dm: Annotate struct dm_bio_prison with __counted_by Kees Cook
@ 2023-09-15 20:32 ` Gustavo A. R. Silva
2023-09-29 19:21 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Gustavo A. R. Silva @ 2023-09-15 20:32 UTC (permalink / raw)
To: Kees Cook, Alasdair Kergon
Cc: Mike Snitzer, dm-devel, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On 9/15/23 14:04, Kees Cook wrote:
> 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 dm_bio_prison.
>
> [1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
>
> Cc: Alasdair Kergon <agk@redhat.com>
> Cc: Mike Snitzer <snitzer@kernel.org>
> Cc: dm-devel@redhat.com
> Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
--
Gustavo
> ---
> drivers/md/dm-bio-prison-v1.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/md/dm-bio-prison-v1.c b/drivers/md/dm-bio-prison-v1.c
> index 92afdca760ae..9ab32abe5ed4 100644
> --- a/drivers/md/dm-bio-prison-v1.c
> +++ b/drivers/md/dm-bio-prison-v1.c
> @@ -26,7 +26,7 @@ struct prison_region {
> struct dm_bio_prison {
> mempool_t cell_pool;
> unsigned int num_locks;
> - struct prison_region regions[];
> + struct prison_region regions[] __counted_by(num_locks);
> };
>
> static struct kmem_cache *_cell_cache;
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] dm: Annotate struct dm_bio_prison with __counted_by
2023-09-15 20:04 [PATCH] dm: Annotate struct dm_bio_prison with __counted_by Kees Cook
2023-09-15 20:32 ` Gustavo A. R. Silva
@ 2023-09-29 19:21 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-09-29 19:21 UTC (permalink / raw)
To: Alasdair Kergon, Kees Cook
Cc: Mike Snitzer, dm-devel, Nathan Chancellor, Nick Desaulniers,
Tom Rix, linux-kernel, llvm, linux-hardening
On Fri, 15 Sep 2023 13:04:08 -0700, Kees Cook wrote:
> 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 dm_bio_prison.
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] dm: Annotate struct dm_bio_prison with __counted_by
https://git.kernel.org/kees/c/1eb1f6b6c911
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-09-29 19:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-15 20:04 [PATCH] dm: Annotate struct dm_bio_prison with __counted_by Kees Cook
2023-09-15 20:32 ` Gustavo A. R. Silva
2023-09-29 19:21 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox