Skip to contentSkip to conversation

Fix hostap_cs double kfree

PATCH Eugene Teo 3 participants 5 messages Mar 15, 2006 Networking drivers (wireless)

lore
Share & tools
lore

Eugene Teo

author
#0 lore raw

prism2_config() kfree's twice if kmalloc fails.

Coverity bug #930

drivers/net/wireless/hostap/hostap_cs.c renamed from drivers/net/wireless/hostap/hostap_cs.c~ +4 -4
@@ -585,8 +585,6 @@
 	parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
 	hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
 	if (parse == NULL || hw_priv == NULL) {
-		kfree(parse);
-		kfree(hw_priv);
 		ret = -ENOMEM;
 		goto failed;
 	}
@@ -783,8 +781,10 @@
 	cs_error(link->handle, last_fn, last_ret);
 
  failed:
-	kfree(parse);
-	kfree(hw_priv);
+	if (parse)
+		kfree(parse);
+	if (hw_priv)
+		kfree(hw_priv);
 	prism2_release((u_long)link);
 	return ret;
 }
Signature · 2 lines
1024D/A6D12F80 print D51D 2633 8DAC 04DB 7265  9BB8 5883 6DAA A6D1 2F80
main(i) { putchar(182623909 >> (i-1) * 5&31|!!(i<7)<<6) && main(++i); }
#1 lore raw

Hi Eugene,

Quoted 7 lines · Eugene Teo

failed:

drivers/net/wireless/hostap/hostap_cs.c renamed from drivers/net/wireless/hostap/hostap_cs.c~ +4 -2
-	kfree(parse);
-	kfree(hw_priv);
+	if (parse)
+		kfree(parse);
+	if (hw_priv)
+		kfree(hw_priv);
Quoted 5 lines
	prism2_release((u_long)link);
	return ret;
}

I don't think those if's are needed, since the kfree code already does:

void kfree(const void *objp)

{
        if (unlikely(!objp))
                return;

...
}

But if you really want to use it, I suggest using if (likely
(!<pointer>)) there to hint gcc of a possible optimization.

Cheers,

Felipe Damasio

author
#2 lore raw

<quote sender="Felipe W Damasio">

Quoted 13 lines

drivers/net/wireless/hostap/hostap_cs.c line 787

Quoted 7 lines · Eugene Teo

failed:

drivers/net/wireless/hostap/hostap_cs.c renamed from drivers/net/wireless/hostap/hostap_cs.c~ +4 -2
-	kfree(parse);
-	kfree(hw_priv);
+	if (parse)
+		kfree(parse);
+	if (hw_priv)
+		kfree(hw_priv);

I don't think those if's are needed, since the kfree code already does:

void kfree(const void *objp)

Quoted 8 lines
{
        if (unlikely(!objp))
                return;

...
}

But if you really want to use it, I suggest using if (likely
(!<pointer>)) there to hint gcc of a possible optimization.

Ah, thanks for the tip.

Eugene

Signature · 2 lines
1024D/A6D12F80 print D51D 2633 8DAC 04DB 7265  9BB8 5883 6DAA A6D1 2F80
main(i) { putchar(182623909 >> (i-1) * 5&31|!!(i<7)<<6) && main(++i); }
#3 lore raw
In reply to Eugene Teo
Quoted 3 lines · Eugene Teo

prism2_config() kfree's twice if kmalloc fails.

Coverity bug #930

Thanks. I'm going through the issues related to Host AP driver in Coverity database and send a set of patches after some testing.

drivers/net/wireless/hostap/hostap_cs.c line 590

Quoted 11 lines
drivers/net/wireless/hostap/hostap_cs.c renamed from drivers/net/wireless/hostap/hostap_cs.c~ +0 -2
@@ -585,8 +585,6 @@
 	parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
 	hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
 	if (parse == NULL || hw_priv == NULL) {
-		kfree(parse);
-		kfree(hw_priv);
 		ret = -ENOMEM;
 		goto failed;
 	}

This is a valid fix..

drivers/net/wireless/hostap/hostap_cs.c line 789

Quoted 12 lines
drivers/net/wireless/hostap/hostap_cs.c renamed from drivers/net/wireless/hostap/hostap_cs.c~ +4 -2
@@ -783,8 +781,10 @@
 	cs_error(link->handle, last_fn, last_ret);
 
  failed:
-	kfree(parse);
-	kfree(hw_priv);
+	if (parse)
+		kfree(parse);
+	if (hw_priv)
+		kfree(hw_priv);
 	prism2_release((u_long)link);
 	return ret;

.. but this is not.

Signature · 1 line
Jouni Malinen                                            PGP id EFC895FA
author
#4 lore raw

<quote sender="Jouni Malinen">

Quoted 7 lines · Eugene Teo
Quoted 3 lines

prism2_config() kfree's twice if kmalloc fails.

Coverity bug #930

Thanks. I'm going through the issues related to Host AP driver in Coverity database and send a set of patches after some testing.

Ok, here's a resend. Thanks.

Eugene

--
prism2_config() kfree's twice if kmalloc fails.

Coverity bug #930

drivers/net/wireless/hostap/hostap_cs.c renamed from drivers/net/wireless/hostap/hostap_cs.c~ +0 -2
@@ -585,8 +585,6 @@
 	parse = kmalloc(sizeof(cisparse_t), GFP_KERNEL);
 	hw_priv = kmalloc(sizeof(*hw_priv), GFP_KERNEL);
 	if (parse == NULL || hw_priv == NULL) {
-		kfree(parse);
-		kfree(hw_priv);
 		ret = -ENOMEM;
 		goto failed;
 	}
Signature · 2 lines
1024D/A6D12F80 print D51D 2633 8DAC 04DB 7265  9BB8 5883 6DAA A6D1 2F80
main(i) { putchar(182623909 >> (i-1) * 5&31|!!(i<7)<<6) && main(++i); }