2020-01-16 10:07:05

by Colin King

Subject: [PATCH][next][resend] 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]>
---
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 9d0cee1c837f..5fda810c79dc 100644
--- a/drivers/tee/amdtee/core.c
+++ b/drivers/tee/amdtee/core.c
@@ -444,11 +444,11 @@ static int __init amdtee_driver_init(void)
goto err_fail;

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-16 10:59:15

by Rijo Thomas

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

Hi Colin,

On 16/01/20 3:19 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.
>

This patch does not apply cleanly to current cryptodev-2.6 tree.
Request you to pull and rebase the patch to current cryptodev-2.6 tree,
build and then submit.

Thanks,
Rijo

> Addresses-Coverity: ("Dereference null return")
> Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver")
> Signed-off-by: Colin Ian King <[email protected]>
> ---
> 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 9d0cee1c837f..5fda810c79dc 100644
> --- a/drivers/tee/amdtee/core.c
> +++ b/drivers/tee/amdtee/core.c
> @@ -444,11 +444,11 @@ static int __init amdtee_driver_init(void)
> goto err_fail;
>
> 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;
> }
>