* [PATCH] staging: rtlwifi: Fix potential NULL pointer dereference
@ 2019-03-13 16:13 Aditya Pakki
2019-03-20 10:38 ` Dan Carpenter
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Aditya Pakki @ 2019-03-13 16:13 UTC (permalink / raw)
To: pakki001; +Cc: kjlu, Greg Kroah-Hartman, Nathan Chancellor, devel, linux-kernel
phydm.internal is allocated using kzalloc which is used multiple
times without a check for NULL pointer. This patch avoids such a
scenario.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
---
drivers/staging/rtlwifi/phydm/rtl_phydm.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/staging/rtlwifi/phydm/rtl_phydm.c b/drivers/staging/rtlwifi/phydm/rtl_phydm.c
index 9930ed954abb..37c7fcb72b65 100644
--- a/drivers/staging/rtlwifi/phydm/rtl_phydm.c
+++ b/drivers/staging/rtlwifi/phydm/rtl_phydm.c
@@ -181,6 +181,9 @@ 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);
odm_init_all_timers(dm);
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] staging: rtlwifi: Fix potential NULL pointer dereference
2019-03-13 16:13 [PATCH] staging: rtlwifi: Fix potential NULL pointer dereference Aditya Pakki
@ 2019-03-20 10:38 ` Dan Carpenter
2019-03-20 13:12 ` Mukesh Ojha
2019-03-20 15:06 ` Mukesh Ojha
2 siblings, 0 replies; 6+ messages in thread
From: Dan Carpenter @ 2019-03-20 10:38 UTC (permalink / raw)
To: Aditya Pakki
Cc: devel, Greg Kroah-Hartman, Nathan Chancellor, kjlu, linux-kernel
On Wed, Mar 13, 2019 at 11:13:34AM -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.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
> ---
> drivers/staging/rtlwifi/phydm/rtl_phydm.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/staging/rtlwifi/phydm/rtl_phydm.c b/drivers/staging/rtlwifi/phydm/rtl_phydm.c
> index 9930ed954abb..37c7fcb72b65 100644
> --- a/drivers/staging/rtlwifi/phydm/rtl_phydm.c
> +++ b/drivers/staging/rtlwifi/phydm/rtl_phydm.c
> @@ -181,6 +181,9 @@ 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)
Don't put a blank line between the allocation and the check. They're
part of the same code and it's weird to double space the code.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] staging: rtlwifi: Fix potential NULL pointer dereference
2019-03-13 16:13 [PATCH] staging: rtlwifi: Fix potential NULL pointer dereference Aditya Pakki
2019-03-20 10:38 ` Dan Carpenter
@ 2019-03-20 13:12 ` Mukesh Ojha
2019-03-20 15:06 ` Mukesh Ojha
2 siblings, 0 replies; 6+ messages in thread
From: Mukesh Ojha @ 2019-03-20 13:12 UTC (permalink / raw)
To: Aditya Pakki
Cc: kjlu, Greg Kroah-Hartman, Nathan Chancellor, devel, linux-kernel
On 3/13/2019 9:43 PM, 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.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
> ---
> drivers/staging/rtlwifi/phydm/rtl_phydm.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/staging/rtlwifi/phydm/rtl_phydm.c b/drivers/staging/rtlwifi/phydm/rtl_phydm.c
> index 9930ed954abb..37c7fcb72b65 100644
> --- a/drivers/staging/rtlwifi/phydm/rtl_phydm.c
> +++ b/drivers/staging/rtlwifi/phydm/rtl_phydm.c
> @@ -181,6 +181,9 @@ 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;
> +
Although, it is good to add a check but nobody is checking this
functions returned value.
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Can you fix that cleanly ? Otherwise i will do.
Cheers,
Mukesh
> _rtl_phydm_init_com_info(rtlpriv, ic, params);
>
> odm_init_all_timers(dm);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] staging: rtlwifi: Fix potential NULL pointer dereference
2019-03-13 16:13 [PATCH] staging: rtlwifi: Fix potential NULL pointer dereference Aditya Pakki
2019-03-20 10:38 ` Dan Carpenter
2019-03-20 13:12 ` Mukesh Ojha
@ 2019-03-20 15:06 ` Mukesh Ojha
2 siblings, 0 replies; 6+ messages in thread
From: Mukesh Ojha @ 2019-03-20 15:06 UTC (permalink / raw)
To: Aditya Pakki
Cc: kjlu, Greg Kroah-Hartman, Nathan Chancellor, devel, linux-kernel
On 3/13/2019 9:43 PM, 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.
>
> Signed-off-by: Aditya Pakki<pakki001@umn.edu>
> ---
> drivers/staging/rtlwifi/phydm/rtl_phydm.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/staging/rtlwifi/phydm/rtl_phydm.c b/drivers/staging/rtlwifi/phydm/rtl_phydm.c
> index 9930ed954abb..37c7fcb72b65 100644
> --- a/drivers/staging/rtlwifi/phydm/rtl_phydm.c
> +++ b/drivers/staging/rtlwifi/phydm/rtl_phydm.c
> @@ -181,6 +181,9 @@ 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;
> +
Although, it is good to add a check but nobody is checking this
functions returned value.
Reviewed-by: Mukesh Ojha <mojha@codeaurora.org>
Can you fix that cleanly ? or i will do?
Cheers,
Mukesh
> _rtl_phydm_init_com_info(rtlpriv, ic, params);
>
> odm_init_all_timers(dm);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] staging: rtlwifi: Fix potential NULL pointer dereference
2019-03-13 16:29 Aditya Pakki
@ 2019-03-17 11:13 ` Greg Kroah-Hartman
0 siblings, 0 replies; 6+ messages in thread
From: Greg Kroah-Hartman @ 2019-03-17 11:13 UTC (permalink / raw)
To: Aditya Pakki
Cc: devel, kjlu, linux-kernel, Sabin Mihai Rapan, Nathan Chancellor
On Wed, Mar 13, 2019 at 11:29:12AM -0500, Aditya Pakki wrote:
> skb allocated via dev_alloc_skb can fail and return a NULL pointer.
> This patch avoids such a scenario and returns, consistent with other
> invocations.
>
> Signed-off-by: Aditya Pakki <pakki001@umn.edu>
> ---
> drivers/staging/rtlwifi/rtl8822be/fw.c | 3 +++
> 1 file changed, 3 insertions(+)
You sent 2 patches that did different things, with the same exact
subject line :(
please fix up, and send as a patch series.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] staging: rtlwifi: Fix potential NULL pointer dereference
@ 2019-03-13 16:29 Aditya Pakki
2019-03-17 11:13 ` Greg Kroah-Hartman
0 siblings, 1 reply; 6+ messages in thread
From: Aditya Pakki @ 2019-03-13 16:29 UTC (permalink / raw)
To: pakki001
Cc: kjlu, Greg Kroah-Hartman, Sabin Mihai Rapan, Nathan Chancellor,
devel, linux-kernel
skb allocated via dev_alloc_skb can fail and return a NULL pointer.
This patch avoids such a scenario and returns, consistent with other
invocations.
Signed-off-by: Aditya Pakki <pakki001@umn.edu>
---
drivers/staging/rtlwifi/rtl8822be/fw.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/staging/rtlwifi/rtl8822be/fw.c b/drivers/staging/rtlwifi/rtl8822be/fw.c
index f061dd1382aa..8fab9c8d1dd0 100644
--- a/drivers/staging/rtlwifi/rtl8822be/fw.c
+++ b/drivers/staging/rtlwifi/rtl8822be/fw.c
@@ -743,6 +743,9 @@ void rtl8822be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished)
u1_rsvd_page_loc, 3);
skb = dev_alloc_skb(totalpacketlen);
+ if (!skb)
+ return;
+
memcpy((u8 *)skb_put(skb, totalpacketlen), &reserved_page_packet,
totalpacketlen);
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-03-20 15:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-13 16:13 [PATCH] staging: rtlwifi: Fix potential NULL pointer dereference Aditya Pakki
2019-03-20 10:38 ` Dan Carpenter
2019-03-20 13:12 ` Mukesh Ojha
2019-03-20 15:06 ` Mukesh Ojha
2019-03-13 16:29 Aditya Pakki
2019-03-17 11:13 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).