svn commit: r309692 - in releng/11.0: . lib/libc/net sys/conf

[Gleb Smirnoff]

Author: glebius
Date: Wed Dec  7 23:29:42 2016
New Revision: 309692
URL: https://svnweb.freebsd.org/changeset/base/309692

Log:
  Merge r309688: address regressions in SA-16:37.libc.
  
  PR:		215105
  Submitted by:	<jtd2004a sbcglobal.net>
  Approved by:	so

Modified:
  releng/11.0/UPDATING
  releng/11.0/lib/libc/net/linkaddr.c
  releng/11.0/sys/conf/newvers.sh
Directory Properties:
  releng/11.0/   (props changed)

Modified: releng/11.0/UPDATING
==============================================================================
--- releng/11.0/UPDATING	Wed Dec  7 23:20:50 2016	(r309691)
+++ releng/11.0/UPDATING	Wed Dec  7 23:29:42 2016	(r309692)
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20161208	p5	FreeBSD-SA-16:37.libc [revised]
+
+	Fix regressions introduced by SA-16:37.libc.
+
 20161206	p4	FreeBSD-SA-16:36.telnetd
 			FreeBSD-SA-16:37.libc
 			FreeBSD-SA-16:38.bhyve

Modified: releng/11.0/lib/libc/net/linkaddr.c
==============================================================================
--- releng/11.0/lib/libc/net/linkaddr.c	Wed Dec  7 23:20:50 2016	(r309691)
+++ releng/11.0/lib/libc/net/linkaddr.c	Wed Dec  7 23:29:42 2016	(r309692)
@@ -125,7 +125,7 @@ link_ntoa(const struct sockaddr_dl *sdl)
 	static char obuf[64];
 	_Static_assert(sizeof(obuf) >= IFNAMSIZ + 20, "obuf is too small");
 	char *out;
-	const char *in, *inlim;
+	const u_char *in, *inlim;
 	int namelen, i, rem;
 
 	namelen = (sdl->sdl_nlen <= IFNAMSIZ) ? sdl->sdl_nlen : IFNAMSIZ;
@@ -142,11 +142,11 @@ link_ntoa(const struct sockaddr_dl *sdl)
 		}
 	}
 
-	in = (const char *)sdl->sdl_data + sdl->sdl_nlen;
+	in = (const u_char *)sdl->sdl_data + sdl->sdl_nlen;
 	inlim = in + sdl->sdl_alen;
 
 	while (in < inlim && rem > 1) {
-		if (in != (const char *)sdl->sdl_data + sdl->sdl_nlen) {
+		if (in != (const u_char *)sdl->sdl_data + sdl->sdl_nlen) {
 			*out++ = '.';
 			rem--;
 		}
@@ -154,15 +154,14 @@ link_ntoa(const struct sockaddr_dl *sdl)
 		if (i > 0xf) {
 			if (rem < 3)
 				break;
+			*out++ = hexlist[i >> 4];
 			*out++ = hexlist[i & 0xf];
-			i >>= 4;
-			*out++ = hexlist[i];
 			rem -= 2;
 		} else {
 			if (rem < 2)
 				break;
 			*out++ = hexlist[i];
-			rem++;
+			rem--;
 		}
 	}
 	*out = 0;

Modified: releng/11.0/sys/conf/newvers.sh
==============================================================================
--- releng/11.0/sys/conf/newvers.sh	Wed Dec  7 23:20:50 2016	(r309691)
+++ releng/11.0/sys/conf/newvers.sh	Wed Dec  7 23:29:42 2016	(r309692)
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.0"
-BRANCH="RELEASE-p4"
+BRANCH="RELEASE-p5"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi