From owner-svn-src-releng@freebsd.org Wed Dec 7 23:31:08 2016 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E1C92C6C95C; Wed, 7 Dec 2016 23:31:08 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 906BD3F3; Wed, 7 Dec 2016 23:31:08 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB7NV7d7025884; Wed, 7 Dec 2016 23:31:07 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB7NV7OU025881; Wed, 7 Dec 2016 23:31:07 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201612072331.uB7NV7OU025881@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 7 Dec 2016 23:31:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r309693 - in releng/10.3: . lib/libc/net sys/conf X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2016 23:31:09 -0000 Author: glebius Date: Wed Dec 7 23:31:07 2016 New Revision: 309693 URL: https://svnweb.freebsd.org/changeset/base/309693 Log: Merge r309688: address regressions in SA-16:37.libc. PR: 215105 Submitted by: Approved by: so Modified: releng/10.3/UPDATING releng/10.3/lib/libc/net/linkaddr.c releng/10.3/sys/conf/newvers.sh Directory Properties: releng/10.3/ (props changed) Modified: releng/10.3/UPDATING ============================================================================== --- releng/10.3/UPDATING Wed Dec 7 23:29:42 2016 (r309692) +++ releng/10.3/UPDATING Wed Dec 7 23:31:07 2016 (r309693) @@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITH 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 Modified: releng/10.3/lib/libc/net/linkaddr.c ============================================================================== --- releng/10.3/lib/libc/net/linkaddr.c Wed Dec 7 23:29:42 2016 (r309692) +++ releng/10.3/lib/libc/net/linkaddr.c Wed Dec 7 23:31:07 2016 (r309693) @@ -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; Modified: releng/10.3/sys/conf/newvers.sh ============================================================================== --- releng/10.3/sys/conf/newvers.sh Wed Dec 7 23:29:42 2016 (r309692) +++ releng/10.3/sys/conf/newvers.sh Wed Dec 7 23:31:07 2016 (r309693) @@ -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