mac80211: tdls: don’t WARN on invalid/missing peer

[PATCH] mac80211: tdls: don’t WARN on invalid/missing peer

Ahmet Eray Karadag posted 1 patch 6 days ago

Download mbox

net/mac80211/tdls.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH] mac80211: tdls: don’t WARN on invalid/missing peer

Posted by Ahmet Eray Karadag 6 days ago

Replace WARN_ON_ONCE with a regular check; log via sdata_err() and return -EINVAL. Avoids panic_on_warn.

Reported-by: syzbot+665dd2d6eb222ac6a6ab@syzkaller.appspotmail.com
Fixes: https://syzkaller.appspot.com/bug?extid=665dd2d6eb222ac6a6ab
Signed-off-by: Ahmet Eray Karadag <eraykrdg1@gmail.com>
---
 net/mac80211/tdls.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/tdls.c b/net/mac80211/tdls.c
index ba5fbacbeeda..85d627e609f3 100644
--- a/net/mac80211/tdls.c
+++ b/net/mac80211/tdls.c
@@ -1457,8 +1457,11 @@ int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev,
 
 		set_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH);
 
-		WARN_ON_ONCE(is_zero_ether_addr(sdata->u.mgd.tdls_peer) ||
-			     !ether_addr_equal(sdata->u.mgd.tdls_peer, peer));
+		if (is_zero_ether_addr(sdata->u.mgd.tdls_peer) || !ether_addr_equal(sdata->u.mgd.tdls_peer, peer)) {
+			sdata_err(sdata, "Invalid/missing peer (%pM vs %pM)\n",
+				sdata->u.mgd.tdls_peer, peer);
+			return -EINVAL;
+		}
 		break;
 	case NL80211_TDLS_DISABLE_LINK:
 		/*
-- 
2.34.1