From fa227cef4db71162cf608e6f725ab87e11b9fc9c Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 16 Feb 2012 17:14:34 +0000 Subject: [PATCH] package/mac80211: fix a possible NULL pointer dereference in rt2x00 SVN-Revision: 30586 --- package/mac80211/Makefile | 2 +- ...0-dont-try-to-destroy-unallocated-workqueue.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 package/mac80211/patches/607-rt2x00-dont-try-to-destroy-unallocated-workqueue.patch diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 1ab9dc2534..13727d153a 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 PKG_VERSION:=2012-02-06 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources PKG_MD5SUM:=fae71c35ee3f3de6329f2db7aed6d265 diff --git a/package/mac80211/patches/607-rt2x00-dont-try-to-destroy-unallocated-workqueue.patch b/package/mac80211/patches/607-rt2x00-dont-try-to-destroy-unallocated-workqueue.patch new file mode 100644 index 0000000000..f9d3ca1ad1 --- /dev/null +++ b/package/mac80211/patches/607-rt2x00-dont-try-to-destroy-unallocated-workqueue.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/rt2x00/rt2x00dev.c ++++ b/drivers/net/wireless/rt2x00/rt2x00dev.c +@@ -1224,7 +1224,8 @@ void rt2x00lib_remove_dev(struct rt2x00_ + cancel_work_sync(&rt2x00dev->rxdone_work); + cancel_work_sync(&rt2x00dev->txdone_work); + } +- destroy_workqueue(rt2x00dev->workqueue); ++ if (rt2x00dev->workqueue) ++ destroy_workqueue(rt2x00dev->workqueue); + + /* + * Free the tx status fifo. -- 2.30.2