| Message ID | 20200116154852.84532-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Herbert Xu |
| Headers | show |
| Series | [next,V2] tee: fix memory allocation failure checks on drv_data and amdtee | expand |
On 16/01/20 9:18 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. > > Addresses-Coverity: ("Dereference null return") > Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver") > Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Rijo Thomas <Rijo-john.Thomas@amd.com> 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; > } >
On Fri, Jan 17, 2020 at 7:40 AM Thomas, Rijo-john <Rijo-john.Thomas@amd.com> wrote: > > > > On 16/01/20 9:18 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. > > > > Addresses-Coverity: ("Dereference null return") > > Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver") > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > > Reviewed-by: Rijo Thomas <Rijo-john.Thomas@amd.com> Acked-by: Jens Wiklander <jens.wiklander@linaro.org> Thanks, Jens > > 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; > > } > >
On Thu, Jan 16, 2020 at 03:48:52PM +0000, 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. > > Addresses-Coverity: ("Dereference null return") > Fixes: 757cc3e9ff1d ("tee: add AMD-TEE driver") > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > 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.
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; }