2020-01-16 15:50:25

by Colin King

Subject: [PATCH][next][V2] tee: fix memory allocation failure checks on drv_data and amdtee

From: Colin Ian King <[email protected]>

Currently the memory allocation failure checks on drv_data and
amdtee are using IS_ERR rather than checking for a null pointer.
Fix these checks to use the conventional null pointer check.

Addresses-Coverity: ("Dereference null return")
Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver")
Signed-off-by: Colin Ian King <[email protected]>
---
V2: update to apply against cryptodev-2.6 tree tip
---
drivers/tee/amdtee/core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/tee/amdtee/core.c b/drivers/tee/amdtee/core.c
index be8937eb5d43..6370bb55f512 100644
--- a/drivers/tee/amdtee/core.c
+++ b/drivers/tee/amdtee/core.c
@@ -446,11 +446,11 @@ static int __init amdtee_driver_init(void)
}

drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL);
- if (IS_ERR(drv_data))
+ if (!drv_data)
return -ENOMEM;

amdtee = kzalloc(sizeof(*amdtee), GFP_KERNEL);
- if (IS_ERR(amdtee)) {
+ if (!amdtee) {
rc = -ENOMEM;
goto err_kfree_drv_data;
}
--
2.24.0

2020-01-17 06:41:57

by Rijo Thomas

Subject: Re: [PATCH][next][V2] tee: fix memory allocation failure checks on drv_data and amdtee

On 16/01/20 9:18 pm, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Currently the memory allocation failure checks on drv_data and
> amdtee are using IS_ERR rather than checking for a null pointer.
> Fix these checks to use the conventional null pointer check.
>
> Addresses-Coverity: ("Dereference null return")
> Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver")
> Signed-off-by: Colin Ian King <[email protected]>

Reviewed-by: Rijo Thomas <[email protected]>

Thanks,
Rijo

> ---
> V2: update to apply against cryptodev-2.6 tree tip
> ---
> drivers/tee/amdtee/core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tee/amdtee/core.c b/drivers/tee/amdtee/core.c
> index be8937eb5d43..6370bb55f512 100644
> --- a/drivers/tee/amdtee/core.c
> +++ b/drivers/tee/amdtee/core.c
> @@ -446,11 +446,11 @@ static int __init amdtee_driver_init(void)
> }
>
> drv_data = kzalloc(sizeof(*drv_data), GFP_KERNEL);
> - if (IS_ERR(drv_data))
> + if (!drv_data)
> return -ENOMEM;
>
> amdtee = kzalloc(sizeof(*amdtee), GFP_KERNEL);
> - if (IS_ERR(amdtee)) {
> + if (!amdtee) {
> rc = -ENOMEM;
> goto err_kfree_drv_data;
> }
>

2020-01-22 10:14:36

by Herbert Xu

Subject: Re: [PATCH][next][V2] tee: fix memory allocation failure checks on drv_data and amdtee

On Thu, Jan 16, 2020 at 03:48:52PM +0000, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Currently the memory allocation failure checks on drv_data and
> amdtee are using IS_ERR rather than checking for a null pointer.
> Fix these checks to use the conventional null pointer check.
>
> Addresses-Coverity: ("Dereference null return")
> Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver")
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> V2: update to apply against cryptodev-2.6 tree tip
> ---
> drivers/tee/amdtee/core.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt