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

Commit 9c371f99 authored by Wei Yongjun's avatar Wei Yongjun Committed by John W. Linville
Browse files

ath5k: fix potential NULL pointer dereference in ath5k_beacon_update() 

The dereference should be moved below the NULL test.

dpatch engine is used to auto generate this patch.
(https://github.com/weiyj/dpatch

)

Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8cc1d523

drivers/net/wireless/ath/ath5k/base.c

+2 −1
Original line number Diff line number Diff line
@@ -1804,7 +1804,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
{

	int ret;

	struct ath5k_hw *ah = hw->priv;

	struct ath5k_vif *avf = (void *)vif->drv_priv;

	struct ath5k_vif *avf;

	struct sk_buff *skb;



	if (WARN_ON(!vif)) {
@@ -1819,6 +1819,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
		goto out;

	}



	avf = (void *)vif->drv_priv;

	ath5k_txbuf_free_skb(ah, avf->bbuf);

	avf->bbuf->skb = skb;

	ret = ath5k_beacon_setup(ah, avf->bbuf);