Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80f81e4b authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: rtllib_module: fix error handle case in alloc_rtllib() 



[ Upstream commit e730cd57ac2dfe94bca0f14a3be8e1b21de41a9c ]

Some variables are leaked in the error handling in alloc_rtllib(), free
the variables in the error path.

Fixes: 94a79942 ("From: wlanfae <wlanfae@realtek.com>")
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarPavel Skripkin <paskripkin@gmail.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20211202030704.2425621-3-yangyingliang@huawei.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9f49cf51

drivers/staging/rtl8192e/rtllib_module.c

+12 −4
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct net_device *alloc_rtllib(int sizeof_priv) 
	err = rtllib_networks_allocate(ieee);

	if (err) {

		pr_err("Unable to allocate beacon storage: %d\n", err);

		goto failed;

		goto free_netdev;

	}

	rtllib_networks_initialize(ieee);
@@ -121,11 +121,13 @@ struct net_device *alloc_rtllib(int sizeof_priv) 
	ieee->hwsec_active = 0;



	memset(ieee->swcamtable, 0, sizeof(struct sw_cam_table) * 32);

	rtllib_softmac_init(ieee);

	err = rtllib_softmac_init(ieee);

	if (err)

		goto free_crypt_info;



	ieee->pHTInfo = kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL);

	if (!ieee->pHTInfo)

		return NULL;

		goto free_softmac;



	HTUpdateDefaultSetting(ieee);

	HTInitializeHTInfo(ieee);
@@ -141,8 +143,14 @@ struct net_device *alloc_rtllib(int sizeof_priv) 


	return dev;



 failed:

free_softmac:

	rtllib_softmac_free(ieee);

free_crypt_info:

	lib80211_crypt_info_free(&ieee->crypt_info);

	rtllib_networks_free(ieee);

free_netdev:

	free_netdev(dev);



	return NULL;

}

EXPORT_SYMBOL(alloc_rtllib);