Commit 929fa2a4 authored by Thomas Meyer's avatar Thomas Meyer Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Use kzalloc rather than kmalloc v2 



Use kzalloc rather than kmalloc followed by memset with 0

This considers some simple cases that are common and easy to validate
Note in particular that there are no ...s in the rule, so all of the
matched code has to be contiguous

The semantic patch that makes this change is available
in scripts/coccinelle/api/alloc/kzalloc-simple.cocci.

Signed-off-by: default avatarThomas Meyer <thomas@m3y3r.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 61fcc016

drivers/staging/rtl8192e/rtllib_crypt.c

+2 −4
Original line number Diff line number Diff line
@@ -104,11 +104,10 @@ int rtllib_register_crypto_ops(struct rtllib_crypto_ops *ops) 
	if (hcrypt == NULL)

		return -1;



	alg = kmalloc(sizeof(*alg), GFP_KERNEL);

	alg = kzalloc(sizeof(*alg), GFP_KERNEL);

	if (alg == NULL)

		return -ENOMEM;



	memset(alg, 0, sizeof(*alg));

	alg->ops = ops;



	spin_lock_irqsave(&hcrypt->lock, flags);
@@ -202,11 +201,10 @@ int __init rtllib_crypto_init(void) 
{

	int ret = -ENOMEM;



	hcrypt = kmalloc(sizeof(*hcrypt), GFP_KERNEL);

	hcrypt = kzalloc(sizeof(*hcrypt), GFP_KERNEL);

	if (!hcrypt)

		goto out;



	memset(hcrypt, 0, sizeof(*hcrypt));

	INIT_LIST_HEAD(&hcrypt->algs);

	spin_lock_init(&hcrypt->lock);

drivers/staging/rtl8192e/rtllib_crypt_ccmp.c

+1 −2
Original line number Diff line number Diff line
@@ -63,10 +63,9 @@ static void *rtllib_ccmp_init(int key_idx) 
{

	struct rtllib_ccmp_data *priv;



	priv = kmalloc(sizeof(*priv), GFP_ATOMIC);

	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);

	if (priv == NULL)

		goto fail;

	memset(priv, 0, sizeof(*priv));

	priv->key_idx = key_idx;



	priv->tfm = (void *)crypto_alloc_cipher("aes", 0, CRYPTO_ALG_ASYNC);

drivers/staging/rtl8192e/rtllib_crypt_tkip.c

+1 −2
Original line number Diff line number Diff line
@@ -60,10 +60,9 @@ static void *rtllib_tkip_init(int key_idx) 
{

	struct rtllib_tkip_data *priv;



	priv = kmalloc(sizeof(*priv), GFP_ATOMIC);

	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);

	if (priv == NULL)

		goto fail;

	memset(priv, 0, sizeof(*priv));

	priv->key_idx = key_idx;

	priv->tx_tfm_arc4 = crypto_alloc_blkcipher("ecb(arc4)", 0,

			CRYPTO_ALG_ASYNC);

drivers/staging/rtl8192e/rtllib_crypt_wep.c

+1 −2
Original line number Diff line number Diff line
@@ -38,10 +38,9 @@ static void *prism2_wep_init(int keyidx) 
{

	struct prism2_wep_data *priv;



	priv = kmalloc(sizeof(*priv), GFP_ATOMIC);

	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);

	if (priv == NULL)

		goto fail;

	memset(priv, 0, sizeof(*priv));

	priv->key_idx = keyidx;



	priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);

drivers/staging/rtl8192e/rtllib_softmac.c

+1 −2
Original line number Diff line number Diff line
@@ -3048,10 +3048,9 @@ void rtllib_softmac_init(struct rtllib_device *ieee) 
	ieee->state = RTLLIB_NOLINK;

	for (i = 0; i < 5; i++)

		ieee->seq_ctrl[i] = 0;

	ieee->pDot11dInfo = kmalloc(sizeof(struct rt_dot11d_info), GFP_ATOMIC);

	ieee->pDot11dInfo = kzalloc(sizeof(struct rt_dot11d_info), GFP_ATOMIC);

	if (!ieee->pDot11dInfo)

		RTLLIB_DEBUG(RTLLIB_DL_ERR, "can't alloc memory for DOT11D\n");

	memset(ieee->pDot11dInfo, 0, sizeof(struct rt_dot11d_info));

	ieee->LinkDetectInfo.SlotIndex = 0;

	ieee->LinkDetectInfo.SlotNum = 2;

	ieee->LinkDetectInfo.NumRecvBcnInPeriod = 0;