2019-03-19 20:18:22

by Aditya Pakki

[permalink] [raw]
Subject: [PATCH v2] staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc

phydm.internal is allocated using kzalloc which is used multiple
times without a check for NULL pointer. This patch avoids such a
scenario.

--
v1: Patch collision with different things, fix as per Greg
Signed-off-by: Aditya Pakki <[email protected]>
---
drivers/staging/rtlwifi/phydm/rtl_phydm.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/staging/rtlwifi/phydm/rtl_phydm.c b/drivers/staging/rtlwifi/phydm/rtl_phydm.c
index 9930ed954abb..a7932706f286 100644
--- a/drivers/staging/rtlwifi/phydm/rtl_phydm.c
+++ b/drivers/staging/rtlwifi/phydm/rtl_phydm.c
@@ -180,6 +180,8 @@ static int rtl_phydm_init_priv(struct rtl_priv *rtlpriv,

rtlpriv->phydm.internal =
kzalloc(sizeof(struct phy_dm_struct), GFP_KERNEL);
+ if (!rtlpriv->phydm.internal)
+ return -ENOMEM;

_rtl_phydm_init_com_info(rtlpriv, ic, params);

--
2.17.1



2019-03-20 07:24:42

by Greg KH

[permalink] [raw]
Subject: Re: [PATCH v2] staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc

On Tue, Mar 19, 2019 at 03:15:08PM -0500, Aditya Pakki wrote:
> phydm.internal is allocated using kzalloc which is used multiple
> times without a check for NULL pointer. This patch avoids such a
> scenario.
>
> --
> v1: Patch collision with different things, fix as per Greg
> Signed-off-by: Aditya Pakki <[email protected]>

signed-off-by has to be above the -- line. Please fix.

thanks,

greg k-h

2019-03-21 07:23:08

by Dan Carpenter

[permalink] [raw]
Subject: Re: [PATCH v2] staging: rtlwifi: Fix potential NULL pointer dereference of kzalloc

On Tue, Mar 19, 2019 at 03:15:08PM -0500, Aditya Pakki wrote:
> phydm.internal is allocated using kzalloc which is used multiple
> times without a check for NULL pointer. This patch avoids such a
> scenario.
>
> --
> v1: Patch collision with different things, fix as per Greg
> Signed-off-by: Aditya Pakki <[email protected]>
> ---

Gar... Sorry, no, that's not quite right. It should be:

blah blah blah...

Signed-off-by: you
---
V1: Patch collision with different things, fix as per Greg

Try applying your patch with `cat raw_email.txt | git am` and you'll see
the problem with the commit message.

regards,
dan carpenter