* [PATCH][next] apparmor: Use struct_size() helper in kmalloc()
@ 2022-01-25 1:56 Gustavo A. R. Silva
2022-01-26 9:30 ` John Johansen
0 siblings, 1 reply; 2+ messages in thread
From: Gustavo A. R. Silva @ 2022-01-25 1:56 UTC (permalink / raw)
To: John Johansen, James Morris, Serge E. Hallyn
Cc: linux-security-module, linux-kernel, Gustavo A. R. Silva,
linux-hardening
Make use of the struct_size() helper instead of an open-coded version,
in order to avoid any potential type mistakes or integer overflows that,
in the worst scenario, could lead to heap overflows.
Also, address the following sparse warnings:
security/apparmor/lib.c:139:23: warning: using sizeof on a flexible structure
Link: https://github.com/KSPP/linux/issues/174
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
---
security/apparmor/lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
index fa49b81eb54c..5eda003c0d45 100644
--- a/security/apparmor/lib.c
+++ b/security/apparmor/lib.c
@@ -136,7 +136,7 @@ __counted char *aa_str_alloc(int size, gfp_t gfp)
{
struct counted_str *str;
- str = kmalloc(sizeof(struct counted_str) + size, gfp);
+ str = kmalloc(struct_size(str, name, size), gfp);
if (!str)
return NULL;
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] apparmor: Use struct_size() helper in kmalloc()
2022-01-25 1:56 [PATCH][next] apparmor: Use struct_size() helper in kmalloc() Gustavo A. R. Silva
@ 2022-01-26 9:30 ` John Johansen
0 siblings, 0 replies; 2+ messages in thread
From: John Johansen @ 2022-01-26 9:30 UTC (permalink / raw)
To: Gustavo A. R. Silva, James Morris, Serge E. Hallyn
Cc: linux-security-module, linux-kernel, linux-hardening
On 1/24/22 17:56, Gustavo A. R. Silva wrote:
> Make use of the struct_size() helper instead of an open-coded version,
> in order to avoid any potential type mistakes or integer overflows that,
> in the worst scenario, could lead to heap overflows.
>
> Also, address the following sparse warnings:
> security/apparmor/lib.c:139:23: warning: using sizeof on a flexible structure
>
> Link: https://github.com/KSPP/linux/issues/174
> Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
thanks, I have pulled this into my tree
Acked-by: John Johansen <john.johansen@canonical.com>
> ---
> security/apparmor/lib.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
> index fa49b81eb54c..5eda003c0d45 100644
> --- a/security/apparmor/lib.c
> +++ b/security/apparmor/lib.c
> @@ -136,7 +136,7 @@ __counted char *aa_str_alloc(int size, gfp_t gfp)
> {
> struct counted_str *str;
>
> - str = kmalloc(sizeof(struct counted_str) + size, gfp);
> + str = kmalloc(struct_size(str, name, size), gfp);
> if (!str)
> return NULL;
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-26 9:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-25 1:56 [PATCH][next] apparmor: Use struct_size() helper in kmalloc() Gustavo A. R. Silva
2022-01-26 9:30 ` John Johansen
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).