Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8e1ba76 authored by John W. Linville's avatar John W. Linville
Browse files

ath5k: check return value of ieee80211_get_tx_rate

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: default avatarJohn W. Linville <linville@tuxdriver.com>
Cc: stable@kernel.org
Acked-by: default avatarBob Copeland <me@bobcopeland.com>
parent 557de5eb
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -1327,6 +1327,10 @@ ath5k_txbuf_setup(struct ath5k_softc *sc, struct ath5k_buf *bf,
			PCI_DMA_TODEVICE);
			PCI_DMA_TODEVICE);


	rate = ieee80211_get_tx_rate(sc->hw, info);
	rate = ieee80211_get_tx_rate(sc->hw, info);
	if (!rate) {
		ret = -EINVAL;
		goto err_unmap;
	}


	if (info->flags & IEEE80211_TX_CTL_NO_ACK)
	if (info->flags & IEEE80211_TX_CTL_NO_ACK)
		flags |= AR5K_TXDESC_NOACK;
		flags |= AR5K_TXDESC_NOACK;