lkml.org 
[lkml]   [2022]   [Jan]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v4] lkdtm/bugs: Check for the NULL pointer after calling kmalloc
On Thu, Jan 20, 2022 at 05:29:36PM +0800, Jiasheng Jiang wrote:
> As the possible failure of the kmalloc(), the not_checked and checked
> could be NULL pointer.
> Therefore, it should be better to check it in order to avoid the
> dereference of the NULL pointer.
> Also, we need to kfree the 'not_checked' and 'checked' to avoid
> the memory leak if fails.
> And since it is just a test, it may directly return without error
> number.
>
> Fixes: ae2e1aad3e48 ("drivers/misc/lkdtm/bugs.c: add arithmetic overflow and array bounds checks")
> Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
> ---
> Changelog
>
> v1 -> v2
>
> * Change 1. Add the kfree if fails.
>
> v2 -> v3
>
> * Change 1. Add pr_err if fails.
>
> v3 -> v4
>
> * Change 1. Revert to v2 that remove the pr_err.
> ---
> drivers/misc/lkdtm/bugs.c | 5 +++++
> 1 file changed, 5 insertions(+)

Acked-by: Kees Cook <keescook@chromium.org>

>
> diff --git a/drivers/misc/lkdtm/bugs.c b/drivers/misc/lkdtm/bugs.c
> index 4282b625200f..072e3b742edf 100644
> --- a/drivers/misc/lkdtm/bugs.c
> +++ b/drivers/misc/lkdtm/bugs.c
> @@ -248,6 +248,11 @@ void lkdtm_ARRAY_BOUNDS(void)
>
> not_checked = kmalloc(sizeof(*not_checked) * 2, GFP_KERNEL);
> checked = kmalloc(sizeof(*checked) * 2, GFP_KERNEL);
> + if (!not_checked || !checked) {
> + kfree(not_checked);
> + kfree(checked);
> + return;
> + }
>
> pr_info("Array access within bounds ...\n");
> /* For both, touch all bytes in the actual member size. */
> --
> 2.25.1
>

--
Kees Cook

\
 
 \ /
  Last update: 2022-01-20 19:15    [W:1.620 / U:0.404 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site