rtl8192_init_priv_variable: null check is missing for kzalloc
PATCH 1/1 rtl8192_init_priv_variable: null check is missing for kzalloc
Allocation for priv->pFirmware may fail, so a null check is necessary. priv->pFirmware is accessed at line 2743. I added the check and made appropriate changes to propagate the errno to the caller.
--- drivers/staging/rtl8192u/r8192U_core.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +11 -2
@@ -2096,7 +2096,7 @@ static void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode) }/* init priv variables here. only non_zero value should be initialized here. */ -static void rtl8192_init_priv_variable (struct net_device *dev) +static int rtl8192_init_priv_variable (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);u8 i;
@@ -2223,6 +2223,10 @@ static void rtl8192_init_priv_variable(struct net_device *dev) priv->AcmControl =0 ; priv->pFirmware =kzalloc (sizeof (rt_firmware),GFP_KERNEL ); +if (!priv->pFirmware) { +return -ENOMEM ; + } +/* rx related queue */ skb_queue_head_init (&priv->rx_queue);
@@ -2236,6 +2240,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev)for (i =0 ; i <MAX_QUEUE_SIZE ; i++)skb_queue_head_init (&priv->ieee80211->skb_drv_aggQ[i]); priv->rf_set_chan = rtl8192_phy_SwChnl; + +return 0 ; }/* init lock here */
@@ -2605,7 +2611,10 @@ static short rtl8192_init(struct net_device *dev) memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9); }#endif -rtl8192_init_priv_variable (dev); + err =rtl8192_init_priv_variable (dev); +if (err) { +return err; + }rtl8192_init_priv_lock (priv);rtl8192_init_priv_task (dev);rtl8192_get_eeprom_size (dev);
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerQuoted 43 lines · Navid Emamdoost
Allocation for
priv->pFirmwaremay fail, so a null check is necessary.priv->pFirmwareis accessed at line 2743. I added the check and made appropriate changes to propagate the errno to the caller.Signed-off-by Navid Emamdoost <[email protected]>--- drivers/staging/rtl8192u/r8192U_core.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)drivers/staging/rtl8192u/r8192U_core.c +7
-1@@ -2096,7 +2096,7 @@ static void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode) }/* init priv variables here. only non_zero value should be initialized here. */ -static void rtl8192_init_priv_variable (struct net_device *dev) +static int rtl8192_init_priv_variable (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);u8 i;@@ -2223,6 +2223,10 @@ static void rtl8192_init_priv_variable(struct net_device *dev) priv->AcmControl =0 ; priv->pFirmware =kzalloc (sizeof (rt_firmware),GFP_KERNEL ); +if (!priv->pFirmware) { +return -ENOMEM ; + } +/* rx related queue */ skb_queue_head_init (&priv->rx_queue);@@ -2236,6 +2240,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev)for (i =0 ; i <MAX_QUEUE_SIZE ; i++)skb_queue_head_init (&priv->ieee80211->skb_drv_aggQ[i]); priv->rf_set_chan = rtl8192_phy_SwChnl; + +return 0 ; }/* init lock here */
drivers/staging/rtl8192u/r8192U_core.c static short rtl8192_init(struct net_device *dev) · line 2617
Quoted 8 lines
drivers/staging/rtl8192u/r8192U_core.c +4
-1@@ -2605,7 +2611,10 @@ static short rtl8192_init(struct net_device *dev) memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9); }#endif -rtl8192_init_priv_variable (dev); + err =rtl8192_init_priv_variable (dev); +if (err) { +return err; + }
Always run checkpatch.pl on your patch before sending it so you do not get grumpy emails telling you to run checkpatch.pl before sending your patch :)
thanks,
greg k-h
PATCH v2 1/1 rtl8192_init_priv_variable: null check is missing for kzalloc
Allocation for priv->pFirmware may fail, so a null check is necessary. priv->pFirmware is accessed later in rtl8192_adapter_start. I added the
check and made appropriate changes to propagate the errno to the caller.
Update: fixed style errors
--- drivers/staging/rtl8192u/r8192U_core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +9 -2
@@ -2096,7 +2096,7 @@ static void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode) }/* init priv variables here. only non_zero value should be initialized here. */ -static void rtl8192_init_priv_variable (struct net_device *dev) +static int rtl8192_init_priv_variable (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);u8 i;
@@ -2223,6 +2223,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev) priv->AcmControl =0 ; priv->pFirmware =kzalloc (sizeof (rt_firmware),GFP_KERNEL ); +if (!priv->pFirmware) +return -ENOMEM ;/* rx related queue */ skb_queue_head_init (&priv->rx_queue);
@@ -2236,6 +2238,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev)for (i =0 ; i <MAX_QUEUE_SIZE ; i++)skb_queue_head_init (&priv->ieee80211->skb_drv_aggQ[i]); priv->rf_set_chan = rtl8192_phy_SwChnl; + +return 0 ; }/* init lock here */
@@ -2605,7 +2609,10 @@ static short rtl8192_init(struct net_device *dev) memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9); }#endif -rtl8192_init_priv_variable (dev); + err =rtl8192_init_priv_variable (dev); +if (err) +return err; +rtl8192_init_priv_lock (priv);rtl8192_init_priv_task (dev);rtl8192_get_eeprom_size (dev);
Signature · 1 line
2.17.1
Greg KH
maintainerQuoted 5 lines · Navid Emamdoost
Allocation for
priv->pFirmwaremay fail, so a null check is necessary.priv->pFirmwareis accessed later inrtl8192_adapter_start. I added the
check and made appropriate changes to propagate the errno to the caller.Update: fixed style errors
The "changelog" goes below the --- line, as is described in the kernel documentation.
Also, please look at other patches for this driver, use the same prefix for the subject line as those did.
v3 please?
thanks,
greg k-h
PATCH v3 1/1 staging: rtl8192u: null check the kzalloc
In rtl8192_init_priv_variable allocation for priv->pFirmware may fail, so a null check is necessary.priv->pFirmware is accessed later in rtl8192_adapter_start. I added the check and made appropriate changes to propagate the errno to the caller.
---
Update v2: fixed style errors
Update V3: fixed prefix
--- drivers/staging/rtl8192u/r8192U_core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +9 -2
@@ -2096,7 +2096,7 @@ static void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode) }/* init priv variables here. only non_zero value should be initialized here. */ -static void rtl8192_init_priv_variable (struct net_device *dev) +static int rtl8192_init_priv_variable (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);u8 i;
@@ -2223,6 +2223,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev) priv->AcmControl =0 ; priv->pFirmware =kzalloc (sizeof (rt_firmware),GFP_KERNEL ); +if (!priv->pFirmware) +return -ENOMEM ;/* rx related queue */ skb_queue_head_init (&priv->rx_queue);
@@ -2236,6 +2238,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev)for (i =0 ; i <MAX_QUEUE_SIZE ; i++)skb_queue_head_init (&priv->ieee80211->skb_drv_aggQ[i]); priv->rf_set_chan = rtl8192_phy_SwChnl; + +return 0 ; }/* init lock here */
@@ -2605,7 +2609,10 @@ static short rtl8192_init(struct net_device *dev) memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9); }#endif -rtl8192_init_priv_variable (dev); + err =rtl8192_init_priv_variable (dev); +if (err) +return err; +rtl8192_init_priv_lock (priv);rtl8192_init_priv_task (dev);rtl8192_get_eeprom_size (dev);
Signature · 1 line
2.17.1
Greg KH
maintainerRe: [PATCH v3] staging: rtl8192u: null check the kzalloc
Quoted 10 lines · Navid Emamdoost
In
rtl8192_init_priv_variableallocation forpriv->pFirmwaremay fail, so a null check isnecessary.priv->pFirmwareis accessed later inrtl8192_adapter_start. I added the check and made appropriate changes to propagate the errno to the caller.---
Update v2: fixed style errors
Update V3: fixed prefixSigned-off-by Navid Emamdoost <[email protected]>
So close, the signed-off-by goes above the --- line.
thanks,
greg k-h
PATCH v4 1/1 staging: rtl8192u: null check the kzalloc
In rtl8192_init_priv_variable allocation for priv->pFirmware may fail, so a null check is necessary.priv->pFirmware is accessed later in rtl8192_adapter_start. I added the check and made appropriate changes to propagate the errno to the caller.
---
Update v2: fixed style errors
Update V3: fixed prefix
Update V4: fixed style
--- drivers/staging/rtl8192u/r8192U_core.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/staging/rtl8192u/r8192U_core.c +9 -2
@@ -2096,7 +2096,7 @@ static void rtl8192_SetWirelessMode(struct net_device *dev, u8 wireless_mode) }/* init priv variables here. only non_zero value should be initialized here. */ -static void rtl8192_init_priv_variable (struct net_device *dev) +static int rtl8192_init_priv_variable (struct net_device *dev) {struct r8192_priv *priv =ieee80211_priv (dev);u8 i;
@@ -2223,6 +2223,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev) priv->AcmControl =0 ; priv->pFirmware =kzalloc (sizeof (rt_firmware),GFP_KERNEL ); +if (!priv->pFirmware) +return -ENOMEM ;/* rx related queue */ skb_queue_head_init (&priv->rx_queue);
@@ -2236,6 +2238,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev)for (i =0 ; i <MAX_QUEUE_SIZE ; i++)skb_queue_head_init (&priv->ieee80211->skb_drv_aggQ[i]); priv->rf_set_chan = rtl8192_phy_SwChnl; + +return 0 ; }/* init lock here */
@@ -2605,7 +2609,10 @@ static short rtl8192_init(struct net_device *dev) memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9); }#endif -rtl8192_init_priv_variable (dev); + err =rtl8192_init_priv_variable (dev); +if (err) +return err; +rtl8192_init_priv_lock (priv);rtl8192_init_priv_task (dev);rtl8192_get_eeprom_size (dev);
Signature · 1 line
2.17.1