diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2012-08-03 12:49:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-15 07:53:04 -0700 |
| commit | 667b6fd34e95ac34244f42bfa895e83fc39d2b8a (patch) | |
| tree | 4c9b80df61b890c303adabb661c3e449d6f30cc2 | |
| parent | ec6942d015aab53df3a3b4aaf6755b4a039355a1 (diff) | |
| download | linux-stable-667b6fd34e95ac34244f42bfa895e83fc39d2b8a.tar.gz linux-stable-667b6fd34e95ac34244f42bfa895e83fc39d2b8a.tar.bz2 linux-stable-667b6fd34e95ac34244f42bfa895e83fc39d2b8a.zip | |
rt61pci: fix NULL pointer dereference in config_lna_gain
commit deee0214def5d8a32b8112f11d9c2b1696e9c0cb upstream.
We can not pass NULL libconf->conf->channel to rt61pci_config() as it
is dereferenced unconditionally in rt61pci_config_lna_gain() subroutine.
Resolves:
https://bugzilla.kernel.org/show_bug.cgi?id=44361
Reported-and-tested-by: <dolohow@gmail.com>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index ee22bd74579d..5fb3a2ecc91a 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c @@ -2243,8 +2243,7 @@ static void rt61pci_txdone(struct rt2x00_dev *rt2x00dev) static void rt61pci_wakeup(struct rt2x00_dev *rt2x00dev) { - struct ieee80211_conf conf = { .flags = 0 }; - struct rt2x00lib_conf libconf = { .conf = &conf }; + struct rt2x00lib_conf libconf = { .conf = &rt2x00dev->hw->conf }; rt61pci_config(rt2x00dev, &libconf, IEEE80211_CONF_CHANGE_PS); } |