From cd610d1cb902c531a185f9fcecd6aa2a2d9152c1 Mon Sep 17 00:00:00 2001 From: Andrew Thompson Date: Mon, 23 Jun 2008 16:08:40 +0000 Subject: [PATCH] Ensure the channel is a number and not a range, the 'channel' command can be easily mixed up with 'chanlist' and would give unexpected results by fixing the channel on the first number in the range. --- sbin/ifconfig/ifieee80211.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c index e81b6a3a023b..c35935394ebd 100644 --- a/sbin/ifconfig/ifieee80211.c +++ b/sbin/ifconfig/ifieee80211.c @@ -666,9 +666,12 @@ set80211channel(const char *val, int d, int s, const struct afswtch *rafp) memset(&chan, 0, sizeof(chan)); if (!isanyarg(val)) { int v, flags; + char *ep; getchaninfo(s); - v = atoi(val); + v = strtol(val, &ep, 10); + if (val[0] == '\0' || ep[0] != '\0' || errno == ERANGE) + errx(1, "invalid channel number"); flags = getchannelflags(val, v); if (v > 255) { /* treat as frequency */ mapfreq(&chan, v, flags);