UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.

Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>

Link: https://lore.kernel.org/r/20190731141925.29268-1-navid.emamdoost@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Navid Emamdoost 2019-07-31 09:19:21 -05:00 committed by Greg Kroah-Hartman
parent 572d8be0d4
commit 09acf29c82
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/rtl8192u/r8192U_core.c
View File

@ -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. */ /* 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); struct r8192_priv *priv = ieee80211_priv(dev);
u8 i; u8 i;
@ -2223,6 +2223,8 @@ static void rtl8192_init_priv_variable(struct net_device *dev)
priv->AcmControl = 0; priv->AcmControl = 0;
priv->pFirmware = kzalloc(sizeof(rt_firmware), GFP_KERNEL); priv->pFirmware = kzalloc(sizeof(rt_firmware), GFP_KERNEL);
if (!priv->pFirmware)
return -ENOMEM;
/* rx related queue */ /* rx related queue */
skb_queue_head_init(&priv->rx_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++) for (i = 0; i < MAX_QUEUE_SIZE; i++)
skb_queue_head_init(&priv->ieee80211->skb_drv_aggQ[i]); skb_queue_head_init(&priv->ieee80211->skb_drv_aggQ[i]);
priv->rf_set_chan = rtl8192_phy_SwChnl; priv->rf_set_chan = rtl8192_phy_SwChnl;
return 0;
} }
/* init lock here */ /* init lock here */
@ -2605,7 +2609,10 @@ static short rtl8192_init(struct net_device *dev)
memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9); memcpy(priv->txqueue_to_outpipemap, queuetopipe, 9);
} }
#endif #endif
rtl8192_init_priv_variable(dev); err = rtl8192_init_priv_variable(dev);
if (err)
return err;
rtl8192_init_priv_lock(priv); rtl8192_init_priv_lock(priv);
rtl8192_init_priv_task(dev); rtl8192_init_priv_task(dev);
rtl8192_get_eeprom_size(dev); rtl8192_get_eeprom_size(dev);