Skip to contentSkip to conversation

staging: rtl8192u: ieee80211: replace kmalloc/memset with kzalloc

PATCH In review Elena Afanasova 3 participants 3 messages Oct 23, 2020 – Oct 26, 2020 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: rtl8192u: ieee80211: replace kmalloc/memset with kzalloc

Replace kmalloc + memset 0 by a call to kzalloc which zeroes memory too. Found with Coccinelle.

---
Changes in v2:
- correct the subject line
- correct the commit message

 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +1 -4
index 63a561ab4a76..fb8483c499b3 100644
@@ -227,13 +227,10 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
 {
 	struct ieee80211_txb *txb;
 	int i;
-	txb = kmalloc(
-		sizeof(struct ieee80211_txb) + (sizeof(u8 *) * nr_frags),
-		gfp_mask);
+	txb = kzalloc(sizeof(*txb) + (sizeof(u8 *) * nr_frags), gfp_mask);
 	if (!txb)
 		return NULL;
 
-	memset(txb, 0, sizeof(struct ieee80211_txb));
 	txb->nr_frags = nr_frags;
 	txb->frag_size = __cpu_to_le16(txb_size);
 
Signature · 1 line
2.25.1
maintainer
#1 lore raw
Quoted 17 lines · Elena Afanasova

Replace kmalloc + memset 0 by a call to kzalloc which zeroes memory too. Found with Coccinelle.

---
Changes in v2:
- correct the subject line
- correct the commit message

 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +0 -0
index 63a561ab4a76..fb8483c499b3 100644

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size, · line 230

Quoted 7 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +1 -3
@@ -227,13 +227,10 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
 {
 	struct ieee80211_txb *txb;
 	int i;
-	txb = kmalloc(
-		sizeof(struct ieee80211_txb) + (sizeof(u8 *) * nr_frags),
-		gfp_mask);
+	txb = kzalloc(sizeof(*txb) + (sizeof(u8 *) * nr_frags), gfp_mask);

Can you please use array_size() for this type of math to ensure that the multiplication is safe?

thanks,

greg k-h

#2 lore raw
In reply to Elena Afanasova
Quoted 17 lines · Elena Afanasova

Replace kmalloc + memset 0 by a call to kzalloc which zeroes memory too. Found with Coccinelle.

---
Changes in v2:
- correct the subject line
- correct the commit message

 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +0 -0
index 63a561ab4a76..fb8483c499b3 100644

drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size, · line 230

Quoted 7 lines
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c +1 -3
@@ -227,13 +227,10 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
 {
 	struct ieee80211_txb *txb;
 	int i;
-	txb = kmalloc(
-		sizeof(struct ieee80211_txb) + (sizeof(u8 *) * nr_frags),
-		gfp_mask);
+	txb = kzalloc(sizeof(*txb) + (sizeof(u8 *) * nr_frags), gfp_mask);

Add a blank line. It's tough know where the line is between where is between the "one thing per patch" but this is probably within the scope. Generally if there is a white space cleanup on the same line you are modifying then you should clean it up. Use the struct_size() macro.

This patch means that we now memset() more memory than before. It's probably a small slow down. I guess I can't be too happy about a slow down... Let's just leave it as-is.

regards,
dan carpenter