* [PATCH][next][resend] tee: fix memory allocation failure checks on drv_data and amdtee
@ 2020-01-16 9:49 Colin King
2020-01-16 10:58 ` Thomas, Rijo-john
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2020-01-16 9:49 UTC (permalink / raw)
To: Jens Wiklander, Gary R Hook, Devaraj Rangasamy, Rijo Thomas,
Herbert Xu, tee-dev, linux-crypto
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
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 <colin.king@canonical.com>
---
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH][next][resend] tee: fix memory allocation failure checks on drv_data and amdtee
2020-01-16 9:49 [PATCH][next][resend] tee: fix memory allocation failure checks on drv_data and amdtee Colin King
@ 2020-01-16 10:58 ` Thomas, Rijo-john
0 siblings, 0 replies; 2+ messages in thread
From: Thomas, Rijo-john @ 2020-01-16 10:58 UTC (permalink / raw)
To: Colin King, Jens Wiklander, Gary R Hook, Devaraj Rangasamy,
Herbert Xu, tee-dev, linux-crypto
Cc: kernel-janitors, linux-kernel
Hi Colin,
On 16/01/20 3:19 pm, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> 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 <colin.king@canonical.com>
> ---
> 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;
> }
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-16 10:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-16 9:49 [PATCH][next][resend] tee: fix memory allocation failure checks on drv_data and amdtee Colin King
2020-01-16 10:58 ` Thomas, Rijo-john
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®