From 3b7b35d8643b3c5c6ed2c2950e4cf740c44c031a Mon Sep 17 00:00:00 2001
From: glebius <glebius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Wed, 7 Dec 2016 23:31:07 +0000
Subject: [PATCH] Merge r309688: address regressions in SA-16:37.libc.

PR:		215105
Submitted by:	<jtd2004a sbcglobal.net>
Approved by:	so


git-svn-id: svn://svn.freebsd.org/base/releng/10.3@309693 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 UPDATING                |  4 ++++
 lib/libc/net/linkaddr.c | 11 +++++------
 sys/conf/newvers.sh     |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/UPDATING b/UPDATING
index 2a5abe5db..53be18616 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20161208	p14	FreeBSD-SA-16:37.libc [revised]
+
+	Fix regressions introduced by SA-16:37.libc.
+
 20161206	p13	FreeBSD-SA-16:36.telnetd
 			FreeBSD-SA-16:37.libc
 			FreeBSD-SA-16:38.bhyve
diff --git a/lib/libc/net/linkaddr.c b/lib/libc/net/linkaddr.c
index f14f22de2..fec220a38 100644
--- a/lib/libc/net/linkaddr.c
+++ b/lib/libc/net/linkaddr.c
@@ -128,7 +128,7 @@ link_ntoa(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;
@@ -145,11 +145,11 @@ link_ntoa(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--;
 		}
@@ -157,15 +157,14 @@ link_ntoa(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;
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 87777eb11..f421b0607 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.3"
-BRANCH="RELEASE-p13"
+BRANCH="RELEASE-p14"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.42.0