diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-08-24 15:27:34 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-20 13:36:42 -0700 |
| commit | 39fc0591b8b83310bcdf8436bd1f226fc4d6fd23 (patch) | |
| tree | ca250f38116759566745260f5dc1b5b1eaa12e12 | |
| parent | 13d7e89ea21d11921cc64729341edb3fbdb70ca9 (diff) | |
| download | lwn-39fc0591b8b83310bcdf8436bd1f226fc4d6fd23.tar.gz lwn-39fc0591b8b83310bcdf8436bd1f226fc4d6fd23.zip | |
ath5k: check return value of ieee80211_get_tx_rate
commit d8e1ba76d619dbc0be8fbeee4e6c683b5c812d3a upstream.
This avoids a NULL pointer dereference as reported here:
https://bugzilla.redhat.com/show_bug.cgi?id=625889
When the WARN condition is hit in ieee80211_get_tx_rate, it will return
NULL. So, we need to check the return value and avoid dereferencing it
in that case.
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Acked-by: Bob Copeland <me@bobcopeland.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/wireless/ath/ath5k/base.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index ab9fe22e4dc5..f1e3469f92fb 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -1318,6 +1318,10 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf, PCI_DMA_TODEVICE); rate = ieee80211_get_tx_rate(sc->hw, info); + if (!rate) { + ret = -EINVAL; + goto err_unmap; + } if (info->flags & IEEE80211_TX_CTL_NO_ACK) flags |= AR5K_TXDESC_NOACK; |