aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-02-16 14:44:59 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-02-21 14:45:25 -0500
commit7be081539e540517d5e1fcbf96b8080074afbf08 (patch)
tree676e36864819d29b505a4c4157c6a913172c5f90 /drivers/net
parent9bbb8168ed3d8b946f9c1901a63a675012de88f2 (diff)
rt2x00: fix a possible NULL pointer dereference
The 'rt2x00lib_probe_dev' function tries to allocate the workqueue. If the allocation fails, 'rt2x00_lib_remove_dev' is called on the error path. Because 'rt2x00dev->workqueue' is NULL in this case, the 'destroy_workqueue' call will cause a NULL pointer dereference. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> Acked-by: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dev.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index c3e1aa7c1a80..d2a1ea98d0f2 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1220,7 +1220,8 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev)
1220 cancel_work_sync(&rt2x00dev->rxdone_work); 1220 cancel_work_sync(&rt2x00dev->rxdone_work);
1221 cancel_work_sync(&rt2x00dev->txdone_work); 1221 cancel_work_sync(&rt2x00dev->txdone_work);
1222 } 1222 }
1223 destroy_workqueue(rt2x00dev->workqueue); 1223 if (rt2x00dev->workqueue)
1224 destroy_workqueue(rt2x00dev->workqueue);
1224 1225
1225 /* 1226 /*
1226 * Free the tx status fifo. 1227 * Free the tx status fifo.