Skip to contentSkip to conversation

b43: fix use-after-free rfkill bug

PATCH In review Stefano Brivio 2 participants 2 messages Jan 13, 2008 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 b43: fix use-after-free rfkill bug

Fix rfkill code which caused a use-after-free bug.

---

drivers/net/wireless/b43/rfkill.c +6 -5
Index: wireless-2.6/drivers/net/wireless/b43/rfkill.c
===================================================================
@@ -138,8 +138,11 @@ void b43_rfkill_init(struct b43_wldev *d
 	rfk->rfkill->user_claim_unsupported = 1;
 
 	rfk->poll_dev = input_allocate_polled_device();
-	if (!rfk->poll_dev)
-		goto err_free_rfk;
+	if (!rfk->poll_dev) {
+		rfkill_free(rfk->rfkill);
+		goto err_freed_rfk;
+	}
+
 	rfk->poll_dev->private = dev;
 	rfk->poll_dev->poll = b43_rfkill_poll;
 	rfk->poll_dev->poll_interval = 1000; /* msecs */
@@ -175,8 +178,7 @@ err_unreg_rfk:
 err_free_polldev:
 	input_free_polled_device(rfk->poll_dev);
 	rfk->poll_dev = NULL;
-err_free_rfk:
-	rfkill_free(rfk->rfkill);
+err_freed_rfk:
 	rfk->rfkill = NULL;
 out_error:
 	rfk->registered = 0;
@@ -195,6 +197,5 @@ void b43_rfkill_exit(struct b43_wldev *d
 	rfkill_unregister(rfk->rfkill);
 	input_free_polled_device(rfk->poll_dev);
 	rfk->poll_dev = NULL;
-	rfkill_free(rfk->rfkill);
 	rfk->rfkill = NULL;
 }

--
Ciao
Stefano

Acked-by on v1 1/1
#1 lore raw
Quoted 33 lines · On Sunday 13 January 2008 18:30:14 Stefano Brivio wrote:

Fix rfkill code which caused a use-after-free bug.

---
Index: wireless-2.6/drivers/net/wireless/b43/rfkill.c
===================================================================

drivers/net/wireless/b43/rfkill.c +6 -4
@@ -138,8 +138,11 @@ void b43_rfkill_init(struct b43_wldev *d
 	rfk->rfkill->user_claim_unsupported = 1;
 
 	rfk->poll_dev = input_allocate_polled_device();
-	if (!rfk->poll_dev)
-		goto err_free_rfk;
+	if (!rfk->poll_dev) {
+		rfkill_free(rfk->rfkill);
+		goto err_freed_rfk;
+	}
+
 	rfk->poll_dev->private = dev;
 	rfk->poll_dev->poll = b43_rfkill_poll;
 	rfk->poll_dev->poll_interval = 1000; /* msecs */
@@ -175,8 +178,7 @@ err_unreg_rfk:
 err_free_polldev:
 	input_free_polled_device(rfk->poll_dev);
 	rfk->poll_dev = NULL;
-err_free_rfk:
-	rfkill_free(rfk->rfkill);
+err_freed_rfk:
 	rfk->rfkill = NULL;
 out_error:
 	rfk->registered = 0;

drivers/net/wireless/b43/rfkill.c void b43_rfkill_exit(struct b43_wldev *d · line 201

Quoted 6 lines
drivers/net/wireless/b43/rfkill.c +0 -1
@@ -195,6 +197,5 @@ void b43_rfkill_exit(struct b43_wldev *d
 	rfkill_unregister(rfk->rfkill);
 	input_free_polled_device(rfk->poll_dev);
 	rfk->poll_dev = NULL;
-	rfkill_free(rfk->rfkill);
 	rfk->rfkill = NULL;
 }
Signature · 1 line
Greetings Michael.