linux-kernel - Re: [PATCH] tee: shm: Potential NULL dereference calling tee_shm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 9 Jan 2018 14:35:02 +0100
From:   Jens Wiklander <jens.wiklander@...aro.org>
To:     Dan Carpenter <dan.carpenter@...cle.com>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        kernel-janitors@...r.kernel.org
Subject: Re: [PATCH] tee: shm: Potential NULL dereference calling tee_shm_register()

On Sat, Jan 6, 2018 at 10:22 AM, Dan Carpenter <dan.carpenter@...cle.com> wrote:
> get_user_pages_fast() can return zero in certain error paths.  We should
> handle that or else it means we accidentally return ERR_PTR(0) which is
> NULL instead of an error pointer.  The callers are not expecting that
> and will crash with a NULL dereference.
>
> Fixes: 033ddf12bcf5 ("tee: add register user memory")
> Signed-off-by: Dan Carpenter <dan.carpenter@...cle.com>
>
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index 04e1b8b37046..cdeb4156acda 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -283,7 +283,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
>         if (rc > 0)
>                 shm->num_pages = rc;
>         if (rc != num_pages) {
> -               if (rc > 0)
> +               if (rc >= 0)
>                         rc = -ENOMEM;
>                 ret = ERR_PTR(rc);
>                 goto err;

Looks good. Thanks.

/Jens