* [PATCH] b43: fix use-after-free rfkill bug
@ 2008-01-13 17:30 Stefano Brivio
2008-01-13 17:41 ` Michael Buesch
0 siblings, 1 reply; 2+ messages in thread
From: Stefano Brivio @ 2008-01-13 17:30 UTC (permalink / raw)
To: Michael Buesch, John W. Linville; +Cc: linux-wireless, bcm43xx-dev
Fix rfkill code which caused a use-after-free bug.
Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>
---
Index: wireless-2.6/drivers/net/wireless/b43/rfkill.c
===================================================================
--- wireless-2.6.orig/drivers/net/wireless/b43/rfkill.c
+++ 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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] b43: fix use-after-free rfkill bug
2008-01-13 17:30 [PATCH] b43: fix use-after-free rfkill bug Stefano Brivio
@ 2008-01-13 17:41 ` Michael Buesch
0 siblings, 0 replies; 2+ messages in thread
From: Michael Buesch @ 2008-01-13 17:41 UTC (permalink / raw)
To: bcm43xx-dev; +Cc: Stefano Brivio, John W. Linville, linux-wireless
On Sunday 13 January 2008 18:30:14 Stefano Brivio wrote:
> Fix rfkill code which caused a use-after-free bug.
>
> Signed-off-by: Stefano Brivio <stefano.brivio@polimi.it>
> ---
> Index: wireless-2.6/drivers/net/wireless/b43/rfkill.c
> ===================================================================
> --- wireless-2.6.orig/drivers/net/wireless/b43/rfkill.c
> +++ 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;
> }
Acked-by: Michael Buesch <mb@bu3sch.de>
--
Greetings Michael.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-01-13 17:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-13 17:30 [PATCH] b43: fix use-after-free rfkill bug Stefano Brivio
2008-01-13 17:41 ` Michael Buesch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).