From eb675b86d5f91132d496b375a3ea34f6fa5220f0 Mon Sep 17 00:00:00 2001
From: stsp <stsp@openbsd.org>
Date: Tue, 12 Dec 2017 15:52:49 +0000
Subject: [PATCH] Make ieee80211_chan2ieee() panic if a bogus channel pointer
 is detected. ok patrick@

---
 sys/net80211/ieee80211.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
index 9e92fbbae19..407da701240 100644
--- a/sys/net80211/ieee80211.c
+++ b/sys/net80211/ieee80211.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ieee80211.c,v 1.64 2017/12/08 21:16:01 stsp Exp $	*/
+/*	$OpenBSD: ieee80211.c,v 1.65 2017/12/12 15:52:49 stsp Exp $	*/
 /*	$NetBSD: ieee80211.c,v 1.19 2004/06/06 05:45:29 dyoung Exp $	*/
 
 /*-
@@ -238,14 +238,8 @@ ieee80211_chan2ieee(struct ieee80211com *ic, const struct ieee80211_channel *c)
 		return c - ic->ic_channels;
 	else if (c == IEEE80211_CHAN_ANYC)
 		return IEEE80211_CHAN_ANY;
-	else if (c != NULL) {
-		printf("%s: invalid channel freq %u flags %x\n",
-			ifp->if_xname, c->ic_freq, c->ic_flags);
-		return 0;		/* XXX */
-	} else {
-		printf("%s: invalid channel (NULL)\n", ifp->if_xname);
-		return 0;		/* XXX */
-	}
+
+	panic("%s: bogus channel pointer", ifp->if_xname);
 }
 
 /*
-- 
2.20.1