* [PATCH][next] atags_proc: Add __counted_by for struct buffer and use struct_size()
@ 2023-10-10 12:46 Gustavo A. R. Silva
2023-10-10 17:58 ` Justin Stitt
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Gustavo A. R. Silva @ 2023-10-10 12:46 UTC (permalink / raw)
To: Russell King
Cc: linux-arm-kernel, linux-kernel, Gustavo A. R. Silva, 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 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>
---
arch/arm/kernel/atags_proc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/kernel/atags_proc.c b/arch/arm/kernel/atags_proc.c
index 3ec2afe78423..cd09f8ab93e3 100644
--- a/arch/arm/kernel/atags_proc.c
+++ b/arch/arm/kernel/atags_proc.c
@@ -7,7 +7,7 @@
struct buffer {
size_t size;
- char data[];
+ char data[] __counted_by(size);
};
static ssize_t atags_read(struct file *file, char __user *buf,
@@ -54,7 +54,7 @@ static int __init init_atags_procfs(void)
WARN_ON(tag->hdr.tag != ATAG_NONE);
- b = kmalloc(sizeof(*b) + size, GFP_KERNEL);
+ b = kmalloc(struct_size(b, data, size), GFP_KERNEL);
if (!b)
goto nomem;
--
2.34.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH][next] atags_proc: Add __counted_by for struct buffer and use struct_size()
2023-10-10 12:46 [PATCH][next] atags_proc: Add __counted_by for struct buffer and use struct_size() Gustavo A. R. Silva
@ 2023-10-10 17:58 ` Justin Stitt
2023-10-10 23:09 ` Kees Cook
2023-12-02 20:32 ` Kees Cook
2 siblings, 0 replies; 4+ messages in thread
From: Justin Stitt @ 2023-10-10 17:58 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Russell King, linux-arm-kernel, linux-kernel, linux-hardening
On Tue, Oct 10, 2023 at 5:47 AM Gustavo A. R. Silva
<gustavoars@kernel.org> 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 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>
Looks good to me.
Reviewed-by: Justin Stitt <justinstitt@google.com>
> ---
> arch/arm/kernel/atags_proc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/kernel/atags_proc.c b/arch/arm/kernel/atags_proc.c
> index 3ec2afe78423..cd09f8ab93e3 100644
> --- a/arch/arm/kernel/atags_proc.c
> +++ b/arch/arm/kernel/atags_proc.c
> @@ -7,7 +7,7 @@
>
> struct buffer {
> size_t size;
> - char data[];
> + char data[] __counted_by(size);
> };
>
> static ssize_t atags_read(struct file *file, char __user *buf,
> @@ -54,7 +54,7 @@ static int __init init_atags_procfs(void)
>
> WARN_ON(tag->hdr.tag != ATAG_NONE);
>
> - b = kmalloc(sizeof(*b) + size, GFP_KERNEL);
> + b = kmalloc(struct_size(b, data, size), GFP_KERNEL);
> if (!b)
> goto nomem;
>
> --
> 2.34.1
>
>
Thanks
Justin
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH][next] atags_proc: Add __counted_by for struct buffer and use struct_size()
2023-10-10 12:46 [PATCH][next] atags_proc: Add __counted_by for struct buffer and use struct_size() Gustavo A. R. Silva
2023-10-10 17:58 ` Justin Stitt
@ 2023-10-10 23:09 ` Kees Cook
2023-12-02 20:32 ` Kees Cook
2 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2023-10-10 23:09 UTC (permalink / raw)
To: Gustavo A. R. Silva
Cc: Russell King, linux-arm-kernel, linux-kernel, linux-hardening
On Tue, Oct 10, 2023 at 06:46:50AM -0600, Gustavo A. R. Silva 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 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>
> ---
> arch/arm/kernel/atags_proc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/kernel/atags_proc.c b/arch/arm/kernel/atags_proc.c
> index 3ec2afe78423..cd09f8ab93e3 100644
> --- a/arch/arm/kernel/atags_proc.c
> +++ b/arch/arm/kernel/atags_proc.c
> @@ -7,7 +7,7 @@
>
> struct buffer {
> size_t size;
> - char data[];
> + char data[] __counted_by(size);
> };
>
> static ssize_t atags_read(struct file *file, char __user *buf,
> @@ -54,7 +54,7 @@ static int __init init_atags_procfs(void)
>
> WARN_ON(tag->hdr.tag != ATAG_NONE);
>
> - b = kmalloc(sizeof(*b) + size, GFP_KERNEL);
> + b = kmalloc(struct_size(b, data, size), GFP_KERNEL);
> if (!b)
> goto nomem;
>
Yup, "size" is assigned before accessing "data".
Reviewed-by: Kees Cook <keescook@chromium.org>
--
Kees Cook
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH][next] atags_proc: Add __counted_by for struct buffer and use struct_size()
2023-10-10 12:46 [PATCH][next] atags_proc: Add __counted_by for struct buffer and use struct_size() Gustavo A. R. Silva
2023-10-10 17:58 ` Justin Stitt
2023-10-10 23:09 ` Kees Cook
@ 2023-12-02 20:32 ` Kees Cook
2 siblings, 0 replies; 4+ messages in thread
From: Kees Cook @ 2023-12-02 20:32 UTC (permalink / raw)
To: Russell King, Gustavo A. R. Silva
Cc: Kees Cook, linux-arm-kernel, linux-kernel, linux-hardening
On Tue, 10 Oct 2023 06:46:50 -0600, Gustavo A. R. Silva 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 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.
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] atags_proc: Add __counted_by for struct buffer and use struct_size()
https://git.kernel.org/kees/c/ac7110d883ff
Take care,
--
Kees Cook
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-12-02 20:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-10 12:46 [PATCH][next] atags_proc: Add __counted_by for struct buffer and use struct_size() Gustavo A. R. Silva
2023-10-10 17:58 ` Justin Stitt
2023-10-10 23:09 ` Kees Cook
2023-12-02 20:32 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).