svn commit: r298980 - stable/9/sbin/ifconfig

[Pedro F. Giffuni]

Author: pfg
Date: Tue May  3 15:06:29 2016
New Revision: 298980
URL: https://svnweb.freebsd.org/changeset/base/298980

Log:
  MFC r298556:
  
  ifconfig: prevent some improbable signed integer overflows.
  
  ic_nchans, from struct:ieee80211req_chaninfo, is an unsigned int.
  Use an unsigned index to prevent overflowing the index.
  
  Adopt unsigned integers in other cases where it is useful
  to be aware of the unsigned quantities and there is no
  risk of the values being negative.

Modified:
  stable/9/sbin/ifconfig/ifieee80211.c
Directory Properties:
  stable/9/sbin/ifconfig/   (props changed)

Modified: stable/9/sbin/ifconfig/ifieee80211.c
==============================================================================
--- stable/9/sbin/ifconfig/ifieee80211.c	Tue May  3 15:04:56 2016	(r298979)
+++ stable/9/sbin/ifconfig/ifieee80211.c	Tue May  3 15:06:29 2016	(r298980)
@@ -223,7 +223,7 @@ static int
 canpromote(int i, int from, int to)
 {
 	const struct ieee80211_channel *fc = &chaninfo->ic_chans[i];
-	int j;
+	u_int j;
 
 	if ((fc->ic_flags & from) != from)
 		return i;
@@ -302,7 +302,7 @@ promote(int i)
 static void
 mapfreq(struct ieee80211_channel *chan, int freq, int flags)
 {
-	int i;
+	u_int i;
 
 	for (i = 0; i < chaninfo->ic_nchans; i++) {
 		const struct ieee80211_channel *c = &chaninfo->ic_chans[i];
@@ -322,7 +322,7 @@ mapfreq(struct ieee80211_channel *chan, 
 static void
 mapchan(struct ieee80211_channel *chan, int ieee, int flags)
 {
-	int i;
+	u_int i;
 
 	for (i = 0; i < chaninfo->ic_nchans; i++) {
 		const struct ieee80211_channel *c = &chaninfo->ic_chans[i];
@@ -2903,7 +2903,7 @@ copy_essid(char buf[], size_t bufsize, c
 {
 	const u_int8_t *p; 
 	size_t maxlen;
-	int i;
+	u_int i;
 
 	if (essid_len > bufsize)
 		maxlen = bufsize;
@@ -4093,7 +4093,7 @@ static void
 printkey(const struct ieee80211req_key *ik)
 {
 	static const uint8_t zerodata[IEEE80211_KEYBUF_SIZE];
-	int keylen = ik->ik_keylen;
+	u_int keylen = ik->ik_keylen;
 	int printcontents;
 
 	printcontents = printkeys &&
@@ -4130,7 +4130,7 @@ printkey(const struct ieee80211req_key *
 		break;
 	}
 	if (printcontents) {
-		int i;
+		u_int i;
 
 		printf(" <");
 		for (i = 0; i < keylen; i++)