From owner-svn-src-releng@freebsd.org Sun Jul 9 04:34:24 2017 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 F045CDAB0D9; Sun, 9 Jul 2017 04:34:23 +0000 (UTC) (envelope-from kib@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 8481C77A24; Sun, 9 Jul 2017 04:34:23 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v694YMHf087570; Sun, 9 Jul 2017 04:34:22 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v694YMuq087569; Sun, 9 Jul 2017 04:34:22 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201707090434.v694YMuq087569@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 9 Jul 2017 04:34:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320825 - releng/11.1/lib/libc/gen X-SVN-Group: releng X-SVN-Commit-Author: kib X-SVN-Commit-Paths: releng/11.1/lib/libc/gen X-SVN-Commit-Revision: 320825 X-SVN-Commit-Repository: base 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: Sun, 09 Jul 2017 04:34:24 -0000 Author: kib Date: Sun Jul 9 04:34:22 2017 New Revision: 320825 URL: https://svnweb.freebsd.org/changeset/base/320825 Log: MFC r320570 MFS r320822: Correct signatures of several pthreads stubs. Approved by: re (gjb) Modified: releng/11.1/lib/libc/gen/_pthread_stubs.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/lib/libc/gen/_pthread_stubs.c ============================================================================== --- releng/11.1/lib/libc/gen/_pthread_stubs.c Sun Jul 9 04:13:33 2017 (r320824) +++ releng/11.1/lib/libc/gen/_pthread_stubs.c Sun Jul 9 04:34:22 2017 (r320825) @@ -279,10 +279,11 @@ STUB_FUNC2(pthread_kill, PJT_KILL, int, void *, int) STUB_FUNC2(pthread_setcancelstate, PJT_SETCANCELSTATE, int, int, void *) STUB_FUNC2(pthread_setcanceltype, PJT_SETCANCELTYPE, int, int, void *) STUB_FUNC(pthread_testcancel, PJT_TESTCANCEL, void) -STUB_FUNC1(__pthread_cleanup_pop_imp, PJT_CLEANUP_POP_IMP, int, int) -STUB_FUNC2(__pthread_cleanup_push_imp, PJT_CLEANUP_PUSH_IMP, void, void*, void *); -STUB_FUNC1(_pthread_cancel_enter, PJT_CANCEL_ENTER, int, int) -STUB_FUNC1(_pthread_cancel_leave, PJT_CANCEL_LEAVE, int, int) +STUB_FUNC1(__pthread_cleanup_pop_imp, PJT_CLEANUP_POP_IMP, void, int) +STUB_FUNC3(__pthread_cleanup_push_imp, PJT_CLEANUP_PUSH_IMP, void, void *, + void *, void *); +STUB_FUNC1(_pthread_cancel_enter, PJT_CANCEL_ENTER, void, int) +STUB_FUNC1(_pthread_cancel_leave, PJT_CANCEL_LEAVE, void, int) static int stub_zero(void) From owner-svn-src-releng@freebsd.org Mon Jul 10 07:13:00 2017 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 7769ED9FA57; Mon, 10 Jul 2017 07:13:00 +0000 (UTC) (envelope-from kib@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 4498D7ECA5; Mon, 10 Jul 2017 07:13:00 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6A7CxEQ049960; Mon, 10 Jul 2017 07:12:59 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6A7CxVc049959; Mon, 10 Jul 2017 07:12:59 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201707100712.v6A7CxVc049959@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 10 Jul 2017 07:12:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320867 - releng/11.1/sys/kern X-SVN-Group: releng X-SVN-Commit-Author: kib X-SVN-Commit-Paths: releng/11.1/sys/kern X-SVN-Commit-Revision: 320867 X-SVN-Commit-Repository: base 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: Mon, 10 Jul 2017 07:13:00 -0000 Author: kib Date: Mon Jul 10 07:12:59 2017 New Revision: 320867 URL: https://svnweb.freebsd.org/changeset/base/320867 Log: MFC r320619 MFS r320863: Resolve confusion between different error code spaces. Approved by: re (delphij) Modified: releng/11.1/sys/kern/kern_exec.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/sys/kern/kern_exec.c ============================================================================== --- releng/11.1/sys/kern/kern_exec.c Mon Jul 10 06:28:50 2017 (r320866) +++ releng/11.1/sys/kern/kern_exec.c Mon Jul 10 07:12:59 2017 (r320867) @@ -1055,9 +1055,9 @@ exec_unmap_first_page(imgp) } /* - * Destroy old address space, and allocate a new stack - * The new stack is only SGROWSIZ large because it is grown - * automatically in trap.c. + * Destroy old address space, and allocate a new stack. + * The new stack is only sgrowsiz large because it is grown + * automatically on a page fault. */ int exec_new_vmspace(imgp, sv) @@ -1111,9 +1111,9 @@ exec_new_vmspace(imgp, sv) VM_PROT_READ | VM_PROT_EXECUTE, VM_PROT_READ | VM_PROT_EXECUTE, MAP_INHERIT_SHARE | MAP_ACC_NO_CHARGE); - if (error) { + if (error != KERN_SUCCESS) { vm_object_deallocate(obj); - return (error); + return (vm_mmap_to_errno(error)); } } @@ -1137,10 +1137,9 @@ exec_new_vmspace(imgp, sv) stack_addr = sv->sv_usrstack - ssiz; error = vm_map_stack(map, stack_addr, (vm_size_t)ssiz, obj != NULL && imgp->stack_prot != 0 ? imgp->stack_prot : - sv->sv_stackprot, - VM_PROT_ALL, MAP_STACK_GROWS_DOWN); - if (error) - return (error); + sv->sv_stackprot, VM_PROT_ALL, MAP_STACK_GROWS_DOWN); + if (error != KERN_SUCCESS) + return (vm_mmap_to_errno(error)); /* * vm_ssize and vm_maxsaddr are somewhat antiquated concepts, but they From owner-svn-src-releng@freebsd.org Mon Jul 10 12:52:20 2017 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 5B0F4DA7663; Mon, 10 Jul 2017 12:52:20 +0000 (UTC) (envelope-from gjb@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 290213BF9; Mon, 10 Jul 2017 12:52:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6ACqJai090240; Mon, 10 Jul 2017 12:52:19 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6ACqJiZ090239; Mon, 10 Jul 2017 12:52:19 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201707101252.v6ACqJiZ090239@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 10 Jul 2017 12:52:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320871 - releng/11.1/share/man/man4 X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.1/share/man/man4 X-SVN-Commit-Revision: 320871 X-SVN-Commit-Repository: base 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: Mon, 10 Jul 2017 12:52:20 -0000 Author: gjb Date: Mon Jul 10 12:52:18 2017 New Revision: 320871 URL: https://svnweb.freebsd.org/changeset/base/320871 Log: MFS11 r320870: MFC r320785: Connect ena(4) to the build. Approved by: re (kib) Sponsored by: The FreeBSD Foundation Modified: releng/11.1/share/man/man4/Makefile Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/share/man/man4/Makefile ============================================================================== --- releng/11.1/share/man/man4/Makefile Mon Jul 10 12:24:56 2017 (r320870) +++ releng/11.1/share/man/man4/Makefile Mon Jul 10 12:52:18 2017 (r320871) @@ -146,6 +146,7 @@ MAN= aac.4 \ ehci.4 \ em.4 \ en.4 \ + ena.4 \ enc.4 \ epair.4 \ esp.4 \ From owner-svn-src-releng@freebsd.org Mon Jul 10 17:42:26 2017 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 0DB31DAD444; Mon, 10 Jul 2017 17:42:26 +0000 (UTC) (envelope-from jhb@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 CB8FF70D05; Mon, 10 Jul 2017 17:42:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6AHgO7O008566; Mon, 10 Jul 2017 17:42:24 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6AHgOcs008564; Mon, 10 Jul 2017 17:42:24 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201707101742.v6AHgOcs008564@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Mon, 10 Jul 2017 17:42:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320874 - in releng/11.1/gnu/usr.bin/gdb: gdb kgdb X-SVN-Group: releng X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in releng/11.1/gnu/usr.bin/gdb: gdb kgdb X-SVN-Commit-Revision: 320874 X-SVN-Commit-Repository: base 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: Mon, 10 Jul 2017 17:42:26 -0000 Author: jhb Date: Mon Jul 10 17:42:24 2017 New Revision: 320874 URL: https://svnweb.freebsd.org/changeset/base/320874 Log: MFS11 320824: Add deprecation notices for gdb and kgdb. Even though gdb and kgdb may not be removed for 12.0 on some architectures, the notice is unconditional as these tools will likely be removed at some point in the future when adequate replacements are available (gdb in ports or lldb in base). Approved by: re (gjb) Relnotes: yes Modified: releng/11.1/gnu/usr.bin/gdb/gdb/gdb.1 releng/11.1/gnu/usr.bin/gdb/kgdb/kgdb.1 Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/gnu/usr.bin/gdb/gdb/gdb.1 ============================================================================== --- releng/11.1/gnu/usr.bin/gdb/gdb/gdb.1 Mon Jul 10 15:27:53 2017 (r320873) +++ releng/11.1/gnu/usr.bin/gdb/gdb/gdb.1 Mon Jul 10 17:42:24 2017 (r320874) @@ -44,6 +44,11 @@ gdb \- The GNU Debugger .IR core \||\| procID\c \&\|]\&\|] .ad b +.SH DEPRECATION NOTICE +This version of gdb is deprecated and will be removed from future versions +of the FreeBSD base system. +A newer version of gdb is available from ports or packages +(devel/gdb). .SH DESCRIPTION The purpose of a debugger such as GDB is to allow you to see what is going on ``inside'' another program while it executes\(em\&or what another Modified: releng/11.1/gnu/usr.bin/gdb/kgdb/kgdb.1 ============================================================================== --- releng/11.1/gnu/usr.bin/gdb/kgdb/kgdb.1 Mon Jul 10 15:27:53 2017 (r320873) +++ releng/11.1/gnu/usr.bin/gdb/kgdb/kgdb.1 Mon Jul 10 17:42:24 2017 (r320874) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 11, 2006 +.Dd July 5, 2017 .Dt KGDB 1 .Os .Sh NAME @@ -40,6 +40,16 @@ .Op Fl d Ar crashdir .Op Fl c Ar core | Fl n Ar dumpnr | Fl r Ar device .Op Ar kernel Op Ar core +.Sh DEPRECATION NOTICE +This version of +.Nm +is deprecated and will be removed from future versions of the +.Fx +base system. +A newer version of +.Nm +is available from ports or packages +(devel/gdb). .Sh DESCRIPTION The .Nm From owner-svn-src-releng@freebsd.org Mon Jul 10 17:53:13 2017 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 C14C2DAD682; Mon, 10 Jul 2017 17:53:13 +0000 (UTC) (envelope-from gjb@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 8499971488; Mon, 10 Jul 2017 17:53:13 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6AHrCsq012507; Mon, 10 Jul 2017 17:53:12 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6AHrCug012506; Mon, 10 Jul 2017 17:53:12 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201707101753.v6AHrCug012506@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 10 Jul 2017 17:53:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320875 - releng/11.1/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.1/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 320875 X-SVN-Commit-Repository: base 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: Mon, 10 Jul 2017 17:53:13 -0000 Author: gjb Date: Mon Jul 10 17:53:12 2017 New Revision: 320875 URL: https://svnweb.freebsd.org/changeset/base/320875 Log: Document r320874, gdb(1) and kgdb(1) deprecation. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Jul 10 17:42:24 2017 (r320874) +++ releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Jul 10 17:53:12 2017 (r320875) @@ -258,6 +258,12 @@ &man.rshd.8;, and &man.rwhod.8; utilities have been marked as deprecated, and planned for removal in &os; 12.0-RELEASE. + + The &man.gdb.1; and &man.kgdb.1; + utilities have been marked as deprecated, and planned for + removal from the base system in the future. A newer version + is available in the devel/gdb port. From owner-svn-src-releng@freebsd.org Tue Jul 11 05:49:43 2017 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 9A92ED9645B; Tue, 11 Jul 2017 05:49:43 +0000 (UTC) (envelope-from kib@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 6955428F9; Tue, 11 Jul 2017 05:49:43 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6B5ngPL004016; Tue, 11 Jul 2017 05:49:42 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6B5nglk004015; Tue, 11 Jul 2017 05:49:42 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201707110549.v6B5nglk004015@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 11 Jul 2017 05:49:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320890 - releng/11.1/lib/libc/sys X-SVN-Group: releng X-SVN-Commit-Author: kib X-SVN-Commit-Paths: releng/11.1/lib/libc/sys X-SVN-Commit-Revision: 320890 X-SVN-Commit-Repository: base 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: Tue, 11 Jul 2017 05:49:43 -0000 Author: kib Date: Tue Jul 11 05:49:42 2017 New Revision: 320890 URL: https://svnweb.freebsd.org/changeset/base/320890 Log: MFC r320801 MFS r320887: Simplify language. Approved by: re (delphij) Modified: releng/11.1/lib/libc/sys/mmap.2 Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/lib/libc/sys/mmap.2 ============================================================================== --- releng/11.1/lib/libc/sys/mmap.2 Tue Jul 11 05:46:55 2017 (r320889) +++ releng/11.1/lib/libc/sys/mmap.2 Tue Jul 11 05:49:42 2017 (r320890) @@ -329,10 +329,12 @@ stack top is the starting address returned by the call bytes. The bottom of the stack at maximum growth is the starting address returned by the call. -The system uses guards to prevent the inadvertent use of -regions into which stacks created with +.Pp +Stacks created with .Dv MAP_STACK -will automatically grow, without mapping the whole stack in advance. +automatically grow. +Guards prevent inadvertent use of the regions into which those +stacks can grow without requiring mapping the whole stack in advance. .El .Pp The From owner-svn-src-releng@freebsd.org Wed Jul 12 07:00:57 2017 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 75B62DB46E5; Wed, 12 Jul 2017 07:00:57 +0000 (UTC) (envelope-from kib@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 43CB57C013; Wed, 12 Jul 2017 07:00:57 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6C70u4s029094; Wed, 12 Jul 2017 07:00:56 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6C70uZO029093; Wed, 12 Jul 2017 07:00:56 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201707120700.v6C70uZO029093@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 12 Jul 2017 07:00:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320904 - releng/11.1/sys/vm X-SVN-Group: releng X-SVN-Commit-Author: kib X-SVN-Commit-Paths: releng/11.1/sys/vm X-SVN-Commit-Revision: 320904 X-SVN-Commit-Repository: base 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, 12 Jul 2017 07:00:57 -0000 Author: kib Date: Wed Jul 12 07:00:56 2017 New Revision: 320904 URL: https://svnweb.freebsd.org/changeset/base/320904 Log: MFC r320843 MFS r320903: Fix loop termination in vm_map_find_min(). Approved by: re (delphij) Modified: releng/11.1/sys/vm/vm_map.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/sys/vm/vm_map.c ============================================================================== --- releng/11.1/sys/vm/vm_map.c Wed Jul 12 06:49:32 2017 (r320903) +++ releng/11.1/sys/vm/vm_map.c Wed Jul 12 07:00:56 2017 (r320904) @@ -1571,7 +1571,7 @@ vm_map_find_min(vm_map_t map, vm_object_t object, vm_o find_space, prot, max, cow); if (rv == KERN_SUCCESS || min_addr >= hint) return (rv); - *addr = min_addr; + *addr = hint = min_addr; } } From owner-svn-src-releng@freebsd.org Wed Jul 12 07:31:30 2017 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 0ACC2DB4F2E; Wed, 12 Jul 2017 07:31:30 +0000 (UTC) (envelope-from kib@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 CC2437D090; Wed, 12 Jul 2017 07:31:29 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6C7VSPp043053; Wed, 12 Jul 2017 07:31:28 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6C7VSFP043052; Wed, 12 Jul 2017 07:31:28 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201707120731.v6C7VSFP043052@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Wed, 12 Jul 2017 07:31:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320909 - releng/11.1/sys/vm X-SVN-Group: releng X-SVN-Commit-Author: kib X-SVN-Commit-Paths: releng/11.1/sys/vm X-SVN-Commit-Revision: 320909 X-SVN-Commit-Repository: base 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, 12 Jul 2017 07:31:30 -0000 Author: kib Date: Wed Jul 12 07:31:28 2017 New Revision: 320909 URL: https://svnweb.freebsd.org/changeset/base/320909 Log: MFS r320889: Restore layout of struct vm_map_entry. Approved by: re (delphij) Modified: releng/11.1/sys/vm/vm_map.h Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/sys/vm/vm_map.h ============================================================================== --- releng/11.1/sys/vm/vm_map.h Wed Jul 12 07:30:14 2017 (r320908) +++ releng/11.1/sys/vm/vm_map.h Wed Jul 12 07:31:28 2017 (r320909) @@ -103,6 +103,7 @@ struct vm_map_entry { struct vm_map_entry *right; /* right child in binary search tree */ vm_offset_t start; /* start address */ vm_offset_t end; /* end address */ + vm_offset_t pad0; vm_offset_t next_read; /* vaddr of the next sequential read */ vm_size_t adj_free; /* amount of adjacent free space */ vm_size_t max_free; /* max free space in subtree */ From owner-svn-src-releng@freebsd.org Wed Jul 12 08:07:17 2017 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 C1202DB59CC; Wed, 12 Jul 2017 08:07:17 +0000 (UTC) (envelope-from delphij@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 8DEF77E129; Wed, 12 Jul 2017 08:07:17 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6C87GlJ057561; Wed, 12 Jul 2017 08:07:16 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6C87GIi057560; Wed, 12 Jul 2017 08:07:16 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201707120807.v6C87GIi057560@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 12 Jul 2017 08:07:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320910 - releng/11.1/crypto/heimdal/lib/krb5 X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: releng/11.1/crypto/heimdal/lib/krb5 X-SVN-Commit-Revision: 320910 X-SVN-Commit-Repository: base 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, 12 Jul 2017 08:07:17 -0000 Author: delphij Date: Wed Jul 12 08:07:16 2017 New Revision: 320910 URL: https://svnweb.freebsd.org/changeset/base/320910 Log: MFS r320907: MFC r320906: MFV r320905: Import upstream fix for CVE-2017-11103. In _krb5_extract_ticket() the KDC-REP service name must be obtained from encrypted version stored in 'enc_part' instead of the unencrypted version stored in 'ticket'. Use of the unecrypted version provides an opportunity for successful server impersonation and other attacks. Submitted by: hrs Obtained from: Heimdal Security: FreeBSD-SA-17:05.heimdal Security: CVE-2017-11103 Approved by: re (kib) Modified: releng/11.1/crypto/heimdal/lib/krb5/ticket.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/crypto/heimdal/lib/krb5/ticket.c ============================================================================== --- releng/11.1/crypto/heimdal/lib/krb5/ticket.c Wed Jul 12 07:31:28 2017 (r320909) +++ releng/11.1/crypto/heimdal/lib/krb5/ticket.c Wed Jul 12 08:07:16 2017 (r320910) @@ -713,8 +713,8 @@ _krb5_extract_ticket(krb5_context context, /* check server referral and save principal */ ret = _krb5_principalname2krb5_principal (context, &tmp_principal, - rep->kdc_rep.ticket.sname, - rep->kdc_rep.ticket.realm); + rep->enc_part.sname, + rep->enc_part.srealm); if (ret) goto out; if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){ From owner-svn-src-releng@freebsd.org Wed Jul 12 08:07:37 2017 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 A17BDDB5A11; Wed, 12 Jul 2017 08:07:37 +0000 (UTC) (envelope-from delphij@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 6E7E47E242; Wed, 12 Jul 2017 08:07:37 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6C87a39057619; Wed, 12 Jul 2017 08:07:36 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6C87a8c057616; Wed, 12 Jul 2017 08:07:36 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201707120807.v6C87a8c057616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 12 Jul 2017 08:07:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320911 - in releng/11.0: . crypto/heimdal/lib/krb5 sys/conf X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in releng/11.0: . crypto/heimdal/lib/krb5 sys/conf X-SVN-Commit-Revision: 320911 X-SVN-Commit-Repository: base 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, 12 Jul 2017 08:07:37 -0000 Author: delphij Date: Wed Jul 12 08:07:36 2017 New Revision: 320911 URL: https://svnweb.freebsd.org/changeset/base/320911 Log: Fix heimdal KDC-REP service name validation vulnerability [SA-17:05] Approved by: so Modified: releng/11.0/UPDATING releng/11.0/crypto/heimdal/lib/krb5/ticket.c releng/11.0/sys/conf/newvers.sh Modified: releng/11.0/UPDATING ============================================================================== --- releng/11.0/UPDATING Wed Jul 12 08:07:16 2017 (r320910) +++ releng/11.0/UPDATING Wed Jul 12 08:07:36 2017 (r320911) @@ -16,7 +16,11 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 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. -20170427 p10 FreeBSD-SA-17:04.ipfilter +20170712 p11 FreeBSD-SA-17:05.heimdal + + Fix heimdal KDC-REP service name validation vulnerability. + +20170427 p10 FreeBSD-SA-17:04.ipfilter Fix ipfilter(4) fragment handling panic. [SA-17:04] Modified: releng/11.0/crypto/heimdal/lib/krb5/ticket.c ============================================================================== --- releng/11.0/crypto/heimdal/lib/krb5/ticket.c Wed Jul 12 08:07:16 2017 (r320910) +++ releng/11.0/crypto/heimdal/lib/krb5/ticket.c Wed Jul 12 08:07:36 2017 (r320911) @@ -713,8 +713,8 @@ _krb5_extract_ticket(krb5_context context, /* check server referral and save principal */ ret = _krb5_principalname2krb5_principal (context, &tmp_principal, - rep->kdc_rep.ticket.sname, - rep->kdc_rep.ticket.realm); + rep->enc_part.sname, + rep->enc_part.srealm); if (ret) goto out; if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){ Modified: releng/11.0/sys/conf/newvers.sh ============================================================================== --- releng/11.0/sys/conf/newvers.sh Wed Jul 12 08:07:16 2017 (r320910) +++ releng/11.0/sys/conf/newvers.sh Wed Jul 12 08:07:36 2017 (r320911) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="11.0" -BRANCH="RELEASE-p10" +BRANCH="RELEASE-p11" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Wed Jul 12 08:07:57 2017 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 BB236DB5A5E; Wed, 12 Jul 2017 08:07:57 +0000 (UTC) (envelope-from delphij@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 82A8F7E369; Wed, 12 Jul 2017 08:07:57 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6C87uIp057683; Wed, 12 Jul 2017 08:07:56 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6C87tpG057671; Wed, 12 Jul 2017 08:07:55 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201707120807.v6C87tpG057671@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 12 Jul 2017 08:07:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320912 - in releng/10.3: . sys/cam/ata sys/conf sys/dev/hyperv/include sys/dev/hyperv/storvsc sys/dev/hyperv/utilities sys/dev/hyperv/vmbus sys/sys sys/x86/x86 X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in releng/10.3: . sys/cam/ata sys/conf sys/dev/hyperv/include sys/dev/hyperv/storvsc sys/dev/hyperv/utilities sys/dev/hyperv/vmbus sys/sys sys/x86/x86 X-SVN-Commit-Revision: 320912 X-SVN-Commit-Repository: base 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, 12 Jul 2017 08:07:57 -0000 Author: delphij Date: Wed Jul 12 08:07:55 2017 New Revision: 320912 URL: https://svnweb.freebsd.org/changeset/base/320912 Log: Fix heimdal KDC-REP service name validation vulnerability [SA-17:05] Boot compatibility improvements with Azure VMs. [EN-17:06] Approved by: so Modified: releng/10.3/UPDATING releng/10.3/sys/cam/ata/ata_xpt.c releng/10.3/sys/conf/files.amd64 releng/10.3/sys/conf/files.i386 releng/10.3/sys/conf/newvers.sh releng/10.3/sys/dev/hyperv/include/hyperv.h releng/10.3/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c releng/10.3/sys/dev/hyperv/storvsc/hv_vstorage.h releng/10.3/sys/dev/hyperv/utilities/hv_kvp.c releng/10.3/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c releng/10.3/sys/sys/eventhandler.h releng/10.3/sys/x86/x86/intr_machdep.c Modified: releng/10.3/UPDATING ============================================================================== --- releng/10.3/UPDATING Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/UPDATING Wed Jul 12 08:07:55 2017 (r320912) @@ -16,6 +16,13 @@ from older versions of FreeBSD, try WITHOUT_CLANG to b stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20170712 p20 FreeBSD-SA-17:05.heimdal + FreeBSD-EN-17:06.hyperv + + Fix heimdal KDC-REP service name validation vulnerability [SA-17:05] + + Boot compatibility improvements with Azure VMs. [EN-17:06] + 20170427 p19 FreeBSD-SA-17:04.ipfilter Fix ipfilter(4) fragment handling panic. [SA-17:04] Modified: releng/10.3/sys/cam/ata/ata_xpt.c ============================================================================== --- releng/10.3/sys/cam/ata/ata_xpt.c Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/cam/ata/ata_xpt.c Wed Jul 12 08:07:55 2017 (r320912) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -827,12 +828,18 @@ noerror: { struct ccb_pathinq cpi; int16_t *ptr; + int veto = 0; ident_buf = &softc->ident_data; for (ptr = (int16_t *)ident_buf; ptr < (int16_t *)ident_buf + sizeof(struct ata_params)/2; ptr++) { *ptr = le16toh(*ptr); } + EVENTHANDLER_INVOKE(ada_probe_veto, path, ident_buf, &veto); + if (veto) { + goto device_fail; + } + if (strncmp(ident_buf->model, "FX", 2) && strncmp(ident_buf->model, "NEC", 3) && strncmp(ident_buf->model, "Pioneer", 7) && Modified: releng/10.3/sys/conf/files.amd64 ============================================================================== --- releng/10.3/sys/conf/files.amd64 Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/conf/files.amd64 Wed Jul 12 08:07:55 2017 (r320912) @@ -262,7 +262,6 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/hyperv/netvsc/hv_net_vsc.c optional hyperv dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv -dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv dev/hyperv/utilities/hv_kvp.c optional hyperv dev/hyperv/utilities/hv_util.c optional hyperv Modified: releng/10.3/sys/conf/files.i386 ============================================================================== --- releng/10.3/sys/conf/files.i386 Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/conf/files.i386 Wed Jul 12 08:07:55 2017 (r320912) @@ -240,7 +240,6 @@ dev/hwpmc/hwpmc_x86.c optional hwpmc dev/hyperv/netvsc/hv_net_vsc.c optional hyperv dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c optional hyperv dev/hyperv/netvsc/hv_rndis_filter.c optional hyperv -dev/hyperv/stordisengage/hv_ata_pci_disengage.c optional hyperv dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c optional hyperv dev/hyperv/utilities/hv_kvp.c optional hyperv dev/hyperv/utilities/hv_util.c optional hyperv Modified: releng/10.3/sys/conf/newvers.sh ============================================================================== --- releng/10.3/sys/conf/newvers.sh Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/conf/newvers.sh Wed Jul 12 08:07:55 2017 (r320912) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.3" -BRANCH="RELEASE-p19" +BRANCH="RELEASE-p20" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/10.3/sys/dev/hyperv/include/hyperv.h ============================================================================== --- releng/10.3/sys/dev/hyperv/include/hyperv.h Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/dev/hyperv/include/hyperv.h Wed Jul 12 08:07:55 2017 (r320912) @@ -124,6 +124,8 @@ typedef struct hv_guid { unsigned char data[16]; } __packed hv_guid; +int snprintf_hv_guid(char *, size_t, const hv_guid *); + #define HV_NIC_GUID \ .data = {0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46, \ 0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E} Modified: releng/10.3/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c ============================================================================== --- releng/10.3/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c Wed Jul 12 08:07:55 2017 (r320912) @@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -198,6 +199,7 @@ static struct storvsc_driver_props g_drv_props_table[] STORVSC_RINGBUFFER_SIZE} }; +static eventhandler_tag storvsc_handler_tag; /* * Sense buffer size changed in win8; have a run-time * variable to track the size we should use. @@ -818,6 +820,7 @@ hv_storvsc_on_iocompletion(struct storvsc_softc *sc, * because the fields will be used later in storvsc_io_done(). */ request->vstor_packet.u.vm_srb.scsi_status = vm_srb->scsi_status; + request->vstor_packet.u.vm_srb.srb_status = vm_srb->srb_status; request->vstor_packet.u.vm_srb.transfer_len = vm_srb->transfer_len; if (((vm_srb->scsi_status & 0xFF) == SCSI_STATUS_CHECK_COND) && @@ -966,20 +969,13 @@ hv_storvsc_on_channel_callback(void *context) static int storvsc_probe(device_t dev) { - int ata_disk_enable = 0; int ret = ENXIO; switch (storvsc_get_storage_type(dev)) { case DRIVER_BLKVSC: if(bootverbose) - device_printf(dev, "DRIVER_BLKVSC-Emulated ATA/IDE probe\n"); - if (!getenv_int("hw.ata.disk_enable", &ata_disk_enable)) { - if(bootverbose) - device_printf(dev, - "Enlightened ATA/IDE detected\n"); - ret = BUS_PROBE_DEFAULT; - } else if(bootverbose) - device_printf(dev, "Emulated ATA/IDE set (hw.ata.disk_enable set)\n"); + device_printf(dev, "Enlightened ATA/IDE detected\n"); + ret = BUS_PROBE_DEFAULT; break; case DRIVER_STORVSC: if(bootverbose) @@ -1967,28 +1963,17 @@ create_storvsc_request(union ccb *ccb, struct hv_storv return(0); } -/* - * SCSI Inquiry checks qualifier and type. - * If qualifier is 011b, means the device server is not capable - * of supporting a peripheral device on this logical unit, and - * the type should be set to 1Fh. - * - * Return 1 if it is valid, 0 otherwise. - */ -static inline int -is_inquiry_valid(const struct scsi_inquiry_data *inq_data) +static uint32_t +is_scsi_valid(const struct scsi_inquiry_data *inq_data) { - uint8_t type; - if (SID_QUAL(inq_data) != SID_QUAL_LU_CONNECTED) { - return (0); - } + u_int8_t type; type = SID_TYPE(inq_data); - if (type == T_NODEVICE) { + if (type == T_NODEVICE) return (0); - } + if (SID_QUAL(inq_data) == SID_QUAL_BAD_LU) + return (0); return (1); } - /** * @brief completion function before returning to CAM * @@ -2057,75 +2042,108 @@ storvsc_io_done(struct hv_storvsc_request *reqp) callout_drain(&reqp->callout); } #endif - ccb->ccb_h.status &= ~CAM_SIM_QUEUED; ccb->ccb_h.status &= ~CAM_STATUS_MASK; if (vm_srb->scsi_status == SCSI_STATUS_OK) { const struct scsi_generic *cmd; - /* - * Check whether the data for INQUIRY cmd is valid or - * not. Windows 10 and Windows 2016 send all zero - * inquiry data to VM even for unpopulated slots. - */ cmd = (const struct scsi_generic *) ((ccb->ccb_h.flags & CAM_CDB_POINTER) ? csio->cdb_io.cdb_ptr : csio->cdb_io.cdb_bytes); - if (cmd->opcode == INQUIRY) { - /* - * The host of Windows 10 or 2016 server will response - * the inquiry request with invalid data for unexisted device: - [0x7f 0x0 0x5 0x2 0x1f ... ] - * But on windows 2012 R2, the response is: - [0x7f 0x0 0x0 0x0 0x0 ] - * That is why here wants to validate the inquiry response. - * The validation will skip the INQUIRY whose response is short, - * which is less than SHORT_INQUIRY_LENGTH (36). - * - * For more information about INQUIRY, please refer to: - * ftp://ftp.avc-pioneer.com/Mtfuji_7/Proposal/Jun09/INQUIRY.pdf - */ - const struct scsi_inquiry_data *inq_data = - (const struct scsi_inquiry_data *)csio->data_ptr; - uint8_t* resp_buf = (uint8_t*)csio->data_ptr; - /* Get the buffer length reported by host */ - int resp_xfer_len = vm_srb->transfer_len; - /* Get the available buffer length */ - int resp_buf_len = resp_xfer_len >= 5 ? resp_buf[4] + 5 : 0; - int data_len = (resp_buf_len < resp_xfer_len) ? resp_buf_len : resp_xfer_len; - if (data_len < SHORT_INQUIRY_LENGTH) { - ccb->ccb_h.status |= CAM_REQ_CMP; - if (bootverbose && data_len >= 5) { - mtx_lock(&sc->hs_lock); - xpt_print(ccb->ccb_h.path, - "storvsc skips the validation for short inquiry (%d)" - " [%x %x %x %x %x]\n", - data_len,resp_buf[0],resp_buf[1],resp_buf[2], - resp_buf[3],resp_buf[4]); - mtx_unlock(&sc->hs_lock); - } - } else if (is_inquiry_valid(inq_data) == 0) { - ccb->ccb_h.status |= CAM_DEV_NOT_THERE; - if (bootverbose && data_len >= 5) { - mtx_lock(&sc->hs_lock); - xpt_print(ccb->ccb_h.path, - "storvsc uninstalled invalid device" - " [%x %x %x %x %x]\n", - resp_buf[0],resp_buf[1],resp_buf[2],resp_buf[3],resp_buf[4]); - mtx_unlock(&sc->hs_lock); - } - } else { - ccb->ccb_h.status |= CAM_REQ_CMP; + if (vm_srb->srb_status != SRB_STATUS_SUCCESS) { + /* + * If there are errors, for example, invalid LUN, + * host will inform VM through SRB status. + */ if (bootverbose) { - mtx_lock(&sc->hs_lock); - xpt_print(ccb->ccb_h.path, - "storvsc has passed inquiry response (%d) validation\n", - data_len); - mtx_unlock(&sc->hs_lock); + if (vm_srb->srb_status == SRB_STATUS_INVALID_LUN) { + xpt_print(ccb->ccb_h.path, + "invalid LUN %d for op: %s\n", + vm_srb->lun, + scsi_op_desc(cmd->opcode, NULL)); + } else { + xpt_print(ccb->ccb_h.path, + "Unknown SRB flag: %d for op: %s\n", + vm_srb->srb_status, + scsi_op_desc(cmd->opcode, NULL)); + } } - } + + /* + * XXX For a selection timeout, all of the LUNs + * on the target will be gone. It works for SCSI + * disks, but does not work for IDE disks. + * + * For CAM_DEV_NOT_THERE, CAM will only get + * rid of the device(s) specified by the path. + */ + if (storvsc_get_storage_type(sc->hs_dev->device) == + DRIVER_STORVSC) + ccb->ccb_h.status |= CAM_SEL_TIMEOUT; + else + ccb->ccb_h.status |= CAM_DEV_NOT_THERE; } else { ccb->ccb_h.status |= CAM_REQ_CMP; } + + if (cmd->opcode == INQUIRY && + vm_srb->srb_status == SRB_STATUS_SUCCESS) { + int resp_xfer_len, resp_buf_len, data_len; + struct scsi_inquiry_data *inq_data = + (struct scsi_inquiry_data *)csio->data_ptr; + /* Get the buffer length reported by host */ + resp_xfer_len = vm_srb->transfer_len; + uint8_t *resp_buf = (uint8_t *)csio->data_ptr; + + /* Get the available buffer length */ + resp_buf_len = resp_xfer_len >= 5 ? resp_buf[4] + 5 : 0; + data_len = (resp_buf_len < resp_xfer_len) ? + resp_buf_len : resp_xfer_len; + if (bootverbose && data_len >= 5) { + xpt_print(ccb->ccb_h.path, "storvsc inquiry " + "(%d) [%x %x %x %x %x ... ]\n", data_len, + resp_buf[0], resp_buf[1], resp_buf[2], + resp_buf[3], resp_buf[4]); + } + /* + * XXX: Manually fix the wrong response returned from WS2012 + */ + if (!is_scsi_valid(inq_data) && + (vmstor_proto_version == VMSTOR_PROTOCOL_VERSION_WIN8_1 || + vmstor_proto_version == VMSTOR_PROTOCOL_VERSION_WIN8 || + vmstor_proto_version == VMSTOR_PROTOCOL_VERSION_WIN7)) { + if (data_len >= 4 && + (resp_buf[2] == 0 || resp_buf[3] == 0)) { + resp_buf[2] = 5; // verion=5 means SPC-3 + resp_buf[3] = 2; // resp fmt must be 2 + if (bootverbose) + xpt_print(ccb->ccb_h.path, + "fix version and resp fmt for 0x%x\n", + vmstor_proto_version); + } + } else if (data_len >= SHORT_INQUIRY_LENGTH) { + char vendor[16]; + + cam_strvis(vendor, inq_data->vendor, + sizeof(inq_data->vendor), sizeof(vendor)); + /* + * XXX: Upgrade SPC2 to SPC3 if host is WIN8 or + * WIN2012 R2 in order to support UNMAP feature. + */ + if (!strncmp(vendor, "Msft", 4) && + SID_ANSI_REV(inq_data) == SCSI_REV_SPC2 && + (vmstor_proto_version == + VMSTOR_PROTOCOL_VERSION_WIN8_1 || + vmstor_proto_version == + VMSTOR_PROTOCOL_VERSION_WIN8)) { + inq_data->version = SCSI_REV_SPC3; + if (bootverbose) { + xpt_print(ccb->ccb_h.path, + "storvsc upgrades " + "SPC2 to SPC3\n"); + } + } + } + } } else { mtx_lock(&sc->hs_lock); xpt_print(ccb->ccb_h.path, @@ -2193,3 +2211,51 @@ storvsc_get_storage_type(device_t dev) return (DRIVER_UNKNOWN); } +#define PCI_VENDOR_INTEL 0x8086 +#define PCI_PRODUCT_PIIX4 0x7111 + +static void +storvsc_ada_probe_veto(void *arg __unused, struct cam_path *path, + struct ata_params *ident_buf __unused, int *veto) +{ + /* + * Hyper-V should ignore ATA + */ + if (path->device->protocol == PROTO_ATA) { + struct ccb_pathinq cpi; + + bzero(&cpi, sizeof(cpi)); + xpt_setup_ccb(&cpi.ccb_h, path, CAM_PRIORITY_NONE); + cpi.ccb_h.func_code = XPT_PATH_INQ; + xpt_action((union ccb *)&cpi); + if (cpi.ccb_h.status == CAM_REQ_CMP && + cpi.hba_vendor == PCI_VENDOR_INTEL && + cpi.hba_device == PCI_PRODUCT_PIIX4) { + (*veto)++; + xpt_print(path, + "Disable ATA for vendor: %x, device: %x\n", + cpi.hba_vendor, cpi.hba_device); + } + } +} + +static void +storvsc_sysinit(void *arg __unused) +{ + if (vm_guest == VM_GUEST_HV) { + storvsc_handler_tag = EVENTHANDLER_REGISTER(ada_probe_veto, + storvsc_ada_probe_veto, NULL, EVENTHANDLER_PRI_ANY); + } +} +SYSINIT(storvsc_sys_init, SI_SUB_DRIVERS, SI_ORDER_SECOND, storvsc_sysinit, + NULL); + +static void +storvsc_sysuninit(void *arg __unused) +{ + if (storvsc_handler_tag != NULL) { + EVENTHANDLER_DEREGISTER(ada_probe_veto, storvsc_handler_tag); + } +} +SYSUNINIT(storvsc_sys_uninit, SI_SUB_DRIVERS, SI_ORDER_SECOND, + storvsc_sysuninit, NULL); Modified: releng/10.3/sys/dev/hyperv/storvsc/hv_vstorage.h ============================================================================== --- releng/10.3/sys/dev/hyperv/storvsc/hv_vstorage.h Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/dev/hyperv/storvsc/hv_vstorage.h Wed Jul 12 08:07:55 2017 (r320912) @@ -249,9 +249,9 @@ struct vstor_packet { /** * SRB Status Masks (can be combined with above status codes) */ -#define SRB_STATUS_QUEUE_FROZEN 0x40 -#define SRB_STATUS_AUTOSENSE_VALID 0x80 - +#define SRB_STATUS_QUEUE_FROZEN 0x40 +#define SRB_STATUS_AUTOSENSE_VALID 0x80 +#define SRB_STATUS_INVALID_LUN 0X20 /** * Packet flags Modified: releng/10.3/sys/dev/hyperv/utilities/hv_kvp.c ============================================================================== --- releng/10.3/sys/dev/hyperv/utilities/hv_kvp.c Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/dev/hyperv/utilities/hv_kvp.c Wed Jul 12 08:07:55 2017 (r320912) @@ -311,28 +311,11 @@ hv_kvp_convert_utf16_ipinfo_to_utf8(struct hv_kvp_ip_m { int err_ip, err_subnet, err_gway, err_dns, err_adap; int UNUSED_FLAG = 1; - int guid_index; struct hv_device *hv_dev; /* GUID Data Structure */ hn_softc_t *sc; /* hn softc structure */ char if_name[4]; - unsigned char guid_instance[40]; - char *guid_data = NULL; char buf[39]; - struct guid_extract { - char a1[2]; - char a2[2]; - char a3[2]; - char a4[2]; - char b1[2]; - char b2[2]; - char c1[2]; - char c2[2]; - char d[4]; - char e[12]; - }; - - struct guid_extract *id; device_t *devs; int devcnt; @@ -359,17 +342,7 @@ hv_kvp_convert_utf16_ipinfo_to_utf8(struct hv_kvp_ip_m /* Trying to find GUID of Network Device */ hv_dev = sc->hn_dev_obj; - for (guid_index = 0; guid_index < 16; guid_index++) { - sprintf(&guid_instance[guid_index * 2], "%02x", - hv_dev->device_id.data[guid_index]); - } - - guid_data = (char *)guid_instance; - id = (struct guid_extract *)guid_data; - snprintf(buf, sizeof(buf), "{%.2s%.2s%.2s%.2s-%.2s%.2s-%.2s%.2s-%.4s-%s}", - id->a4, id->a3, id->a2, id->a1, - id->b2, id->b1, id->c2, id->c1, id->d, id->e); - guid_data = NULL; + snprintf_hv_guid(buf, sizeof(buf), &hv_dev->device_id); sprintf(if_name, "%s%d", "hn", device_get_unit(devs[devcnt])); if (strncmp(buf, (char *)umsg->body.kvp_ip_val.adapter_id, 39) == 0) { Modified: releng/10.3/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c ============================================================================== --- releng/10.3/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c Wed Jul 12 08:07:55 2017 (r320912) @@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include "hv_vmbus_priv.h" #include @@ -298,6 +299,23 @@ vmbus_write_ivar( return (ENOENT); } +static int +vmbus_child_pnpinfo_str(device_t dev, device_t child, char *buf, size_t buflen) +{ + char guidbuf[40]; + struct hv_device *dev_ctx = device_get_ivars(child); + + strlcat(buf, "classid=", buflen); + snprintf_hv_guid(guidbuf, sizeof(guidbuf), &dev_ctx->class_id); + strlcat(buf, guidbuf, buflen); + + strlcat(buf, " deviceid=", buflen); + snprintf_hv_guid(guidbuf, sizeof(guidbuf), &dev_ctx->device_id); + strlcat(buf, guidbuf, buflen); + + return (0); +} + struct hv_device* hv_vmbus_child_device_create( hv_guid type, @@ -324,15 +342,17 @@ hv_vmbus_child_device_create( return (child_dev); } -static void -print_dev_guid(struct hv_device *dev) +int +snprintf_hv_guid(char *buf, size_t sz, const hv_guid *guid) { - int i; - unsigned char guid_name[100]; - for (i = 0; i < 32; i += 2) - sprintf(&guid_name[i], "%02x", dev->class_id.data[i / 2]); - if(bootverbose) - printf("VMBUS: Class ID: %s\n", guid_name); + int cnt; + const unsigned char *d = guid->data; + + cnt = snprintf(buf, sz, + "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x", + d[3], d[2], d[1], d[0], d[5], d[4], d[7], d[6], + d[8], d[9], d[10], d[11], d[12], d[13], d[14], d[15]); + return (cnt); } int @@ -341,9 +361,12 @@ hv_vmbus_child_device_register(struct hv_device *child device_t child; int ret = 0; - print_dev_guid(child_dev); + if (bootverbose) { + char name[40]; + snprintf_hv_guid(name, sizeof(name), &child_dev->class_id); + printf("VMBUS: Class ID: %s\n", name); + } - child = device_add_child(vmbus_devp, NULL, -1); child_dev->device = child; device_set_ivars(child, child_dev); @@ -747,6 +770,7 @@ static device_method_t vmbus_methods[] = { DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_read_ivar, vmbus_read_ivar), DEVMETHOD(bus_write_ivar, vmbus_write_ivar), + DEVMETHOD(bus_child_pnpinfo_str, vmbus_child_pnpinfo_str), { 0, 0 } }; Modified: releng/10.3/sys/sys/eventhandler.h ============================================================================== --- releng/10.3/sys/sys/eventhandler.h Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/sys/eventhandler.h Wed Jul 12 08:07:55 2017 (r320912) @@ -283,4 +283,11 @@ typedef void (*unregister_framebuffer_fn)(void *, stru EVENTHANDLER_DECLARE(register_framebuffer, register_framebuffer_fn); EVENTHANDLER_DECLARE(unregister_framebuffer, unregister_framebuffer_fn); +/* veto ada probing */ +struct cam_path; +struct ata_params; +typedef void (*ada_probe_veto_fn)(void *, struct cam_path *, + struct ata_params *, int *); +EVENTHANDLER_DECLARE(ada_probe_veto, ada_probe_veto_fn); + #endif /* SYS_EVENTHANDLER_H */ Modified: releng/10.3/sys/x86/x86/intr_machdep.c ============================================================================== --- releng/10.3/sys/x86/x86/intr_machdep.c Wed Jul 12 08:07:36 2017 (r320911) +++ releng/10.3/sys/x86/x86/intr_machdep.c Wed Jul 12 08:07:55 2017 (r320912) @@ -535,6 +535,9 @@ intr_shuffle_irqs(void *arg __unused) if (mp_ncpus == 1) return; + /* Does not work properly on Hyper-V. */ + if (vm_guest == VM_GUEST_HV) + return; /* Round-robin assign a CPU to each enabled source. */ mtx_lock(&intr_table_lock); assign_cpu = 1; From owner-svn-src-releng@freebsd.org Wed Jul 12 15:16:02 2017 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 DD19FD99ECB; Wed, 12 Jul 2017 15:16:02 +0000 (UTC) (envelope-from delphij@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 9E422661A1; Wed, 12 Jul 2017 15:16:02 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6CFG1Ku034303; Wed, 12 Jul 2017 15:16:01 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6CFG14N034302; Wed, 12 Jul 2017 15:16:01 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201707121516.v6CFG14N034302@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Wed, 12 Jul 2017 15:16:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320915 - releng/10.3/crypto/heimdal/lib/krb5 X-SVN-Group: releng X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: releng/10.3/crypto/heimdal/lib/krb5 X-SVN-Commit-Revision: 320915 X-SVN-Commit-Repository: base 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, 12 Jul 2017 15:16:03 -0000 Author: delphij Date: Wed Jul 12 15:16:01 2017 New Revision: 320915 URL: https://svnweb.freebsd.org/changeset/base/320915 Log: Add the missed Heimdal patch, freebsd-update bits are not affected. Noticed by: gordon Approved by: so Modified: releng/10.3/crypto/heimdal/lib/krb5/ticket.c Modified: releng/10.3/crypto/heimdal/lib/krb5/ticket.c ============================================================================== --- releng/10.3/crypto/heimdal/lib/krb5/ticket.c Wed Jul 12 14:51:32 2017 (r320914) +++ releng/10.3/crypto/heimdal/lib/krb5/ticket.c Wed Jul 12 15:16:01 2017 (r320915) @@ -713,8 +713,8 @@ _krb5_extract_ticket(krb5_context context, /* check server referral and save principal */ ret = _krb5_principalname2krb5_principal (context, &tmp_principal, - rep->kdc_rep.ticket.sname, - rep->kdc_rep.ticket.realm); + rep->enc_part.sname, + rep->enc_part.srealm); if (ret) goto out; if((flags & EXTRACT_TICKET_ALLOW_SERVER_MISMATCH) == 0){ From owner-svn-src-releng@freebsd.org Wed Jul 12 21:46:18 2017 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 1E35CDA4AD1; Wed, 12 Jul 2017 21:46:18 +0000 (UTC) (envelope-from marius@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 E14A278F0C; Wed, 12 Jul 2017 21:46:17 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6CLkHYn095711; Wed, 12 Jul 2017 21:46:17 GMT (envelope-from marius@FreeBSD.org) Received: (from marius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6CLkH7C095710; Wed, 12 Jul 2017 21:46:17 GMT (envelope-from marius@FreeBSD.org) Message-Id: <201707122146.v6CLkH7C095710@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marius set sender to marius@FreeBSD.org using -f From: Marius Strobl Date: Wed, 12 Jul 2017 21:46:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320922 - releng/11.1/sys/dev/sdhci X-SVN-Group: releng X-SVN-Commit-Author: marius X-SVN-Commit-Paths: releng/11.1/sys/dev/sdhci X-SVN-Commit-Revision: 320922 X-SVN-Commit-Repository: base 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, 12 Jul 2017 21:46:18 -0000 Author: marius Date: Wed Jul 12 21:46:16 2017 New Revision: 320922 URL: https://svnweb.freebsd.org/changeset/base/320922 Log: MF11: r320898; MFC: r320577, r320620 Retry up to 2 ms to enable bus power as at least with some Intel SDHCI/eMMC controllers the first attempt after a D3 to D0 transition, i. e. when the firmware has put the devices into D3 state before, can fail. Approved by: re (gjb) Modified: releng/11.1/sys/dev/sdhci/sdhci.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/sys/dev/sdhci/sdhci.c ============================================================================== --- releng/11.1/sys/dev/sdhci/sdhci.c Wed Jul 12 20:10:53 2017 (r320921) +++ releng/11.1/sys/dev/sdhci/sdhci.c Wed Jul 12 21:46:16 2017 (r320922) @@ -366,6 +366,7 @@ sdhci_set_clock(struct sdhci_slot *slot, uint32_t cloc static void sdhci_set_power(struct sdhci_slot *slot, u_char power) { + int i; uint8_t pwr; if (slot->power == power) @@ -394,9 +395,20 @@ sdhci_set_power(struct sdhci_slot *slot, u_char power) break; } WR1(slot, SDHCI_POWER_CONTROL, pwr); - /* Turn on the power. */ + /* + * Turn on VDD1 power. Note that at least some Intel controllers can + * fail to enable bus power on the first try after transiting from D3 + * to D0, so we give them up to 2 ms. + */ pwr |= SDHCI_POWER_ON; - WR1(slot, SDHCI_POWER_CONTROL, pwr); + for (i = 0; i < 20; i++) { + WR1(slot, SDHCI_POWER_CONTROL, pwr); + if (RD1(slot, SDHCI_POWER_CONTROL) & SDHCI_POWER_ON) + break; + DELAY(100); + } + if (!(RD1(slot, SDHCI_POWER_CONTROL) & SDHCI_POWER_ON)) + slot_printf(slot, "Bus power failed to enable"); if (slot->quirks & SDHCI_QUIRK_INTEL_POWER_UP_RESET) { WR1(slot, SDHCI_POWER_CONTROL, pwr | 0x10); From owner-svn-src-releng@freebsd.org Thu Jul 13 07:32:56 2017 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 6C068D99F96; Thu, 13 Jul 2017 07:32:56 +0000 (UTC) (envelope-from grehan@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 360BC68CAE; Thu, 13 Jul 2017 07:32:56 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6D7WtL7038639; Thu, 13 Jul 2017 07:32:55 GMT (envelope-from grehan@FreeBSD.org) Received: (from grehan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6D7Wt3G038638; Thu, 13 Jul 2017 07:32:55 GMT (envelope-from grehan@FreeBSD.org) Message-Id: <201707130732.v6D7Wt3G038638@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grehan set sender to grehan@FreeBSD.org using -f From: Peter Grehan Date: Thu, 13 Jul 2017 07:32:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320933 - releng/11.1/usr.sbin/bhyve X-SVN-Group: releng X-SVN-Commit-Author: grehan X-SVN-Commit-Paths: releng/11.1/usr.sbin/bhyve X-SVN-Commit-Revision: 320933 X-SVN-Commit-Repository: base 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: Thu, 13 Jul 2017 07:32:56 -0000 Author: grehan Date: Thu Jul 13 07:32:55 2017 New Revision: 320933 URL: https://svnweb.freebsd.org/changeset/base/320933 Log: MFS r320855 ps2 mouse fixes, found by plan9/9front. Approved by: re (kib) Modified: releng/11.1/usr.sbin/bhyve/ps2mouse.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/usr.sbin/bhyve/ps2mouse.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/ps2mouse.c Thu Jul 13 04:46:00 2017 (r320932) +++ releng/11.1/usr.sbin/bhyve/ps2mouse.c Thu Jul 13 07:32:55 2017 (r320933) @@ -62,6 +62,16 @@ __FBSDID("$FreeBSD$"); /* mouse device id */ #define PS2MOUSE_DEV_ID 0x0 +/* mouse data bits */ +#define PS2M_DATA_Y_OFLOW 0x80 +#define PS2M_DATA_X_OFLOW 0x40 +#define PS2M_DATA_Y_SIGN 0x20 +#define PS2M_DATA_X_SIGN 0x10 +#define PS2M_DATA_AONE 0x08 +#define PS2M_DATA_MID_BUTTON 0x04 +#define PS2M_DATA_RIGHT_BUTTON 0x02 +#define PS2M_DATA_LEFT_BUTTON 0x01 + /* mouse status bits */ #define PS2M_STS_REMOTE_MODE 0x40 #define PS2M_STS_ENABLE_DEV 0x20 @@ -169,19 +179,20 @@ movement_get(struct ps2mouse_softc *sc) assert(pthread_mutex_isowned_np(&sc->mtx)); - val0 = sc->status & (PS2M_STS_LEFT_BUTTON | - PS2M_STS_RIGHT_BUTTON | PS2M_STS_MID_BUTTON); + val0 = PS2M_DATA_AONE; + val0 |= sc->status & (PS2M_DATA_LEFT_BUTTON | + PS2M_DATA_RIGHT_BUTTON | PS2M_DATA_MID_BUTTON); if (sc->delta_x >= 0) { if (sc->delta_x > 255) { - val0 |= (1 << 6); + val0 |= PS2M_DATA_X_OFLOW; val1 = 255; } else val1 = sc->delta_x; } else { - val0 |= (1 << 4); + val0 |= PS2M_DATA_X_SIGN; if (sc->delta_x < -255) { - val0 |= (1 << 6); + val0 |= PS2M_DATA_X_OFLOW; val1 = 255; } else val1 = sc->delta_x; @@ -190,14 +201,14 @@ movement_get(struct ps2mouse_softc *sc) if (sc->delta_y >= 0) { if (sc->delta_y > 255) { - val0 |= (1 << 7); + val0 |= PS2M_DATA_Y_OFLOW; val2 = 255; } else val2 = sc->delta_y; } else { - val0 |= (1 << 5); + val0 |= PS2M_DATA_Y_SIGN; if (sc->delta_y < -255) { - val0 |= (1 << 7); + val0 |= PS2M_DATA_Y_OFLOW; val2 = 255; } else val2 = sc->delta_y; From owner-svn-src-releng@freebsd.org Thu Jul 13 07:55:02 2017 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 EFF80D9A9DE; Thu, 13 Jul 2017 07:55:02 +0000 (UTC) (envelope-from grehan@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 B8E4F6A89D; Thu, 13 Jul 2017 07:55:02 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6D7t1HP047108; Thu, 13 Jul 2017 07:55:01 GMT (envelope-from grehan@FreeBSD.org) Received: (from grehan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6D7t0MS047095; Thu, 13 Jul 2017 07:55:00 GMT (envelope-from grehan@FreeBSD.org) Message-Id: <201707130755.v6D7t0MS047095@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grehan set sender to grehan@FreeBSD.org using -f From: Peter Grehan Date: Thu, 13 Jul 2017 07:55:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320934 - in releng/11.1: lib/libvmmapi usr.sbin/bhyve X-SVN-Group: releng X-SVN-Commit-Author: grehan X-SVN-Commit-Paths: in releng/11.1: lib/libvmmapi usr.sbin/bhyve X-SVN-Commit-Revision: 320934 X-SVN-Commit-Repository: base 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: Thu, 13 Jul 2017 07:55:03 -0000 Author: grehan Date: Thu Jul 13 07:55:00 2017 New Revision: 320934 URL: https://svnweb.freebsd.org/changeset/base/320934 Log: MFS 320866 MFC 313727, 317483 In addition, replace the missing caph routines with small helper functions (bhyverun.c) or an open-coded replacement (uart_emul.c) 313727 Capsicumize bhyve 317483 Allow CAP_MMAP_RW on memfd for PCI passthru Approved by: re (kib) Modified: releng/11.1/lib/libvmmapi/vmmapi.c releng/11.1/lib/libvmmapi/vmmapi.h releng/11.1/usr.sbin/bhyve/bhyverun.c releng/11.1/usr.sbin/bhyve/block_if.c releng/11.1/usr.sbin/bhyve/consport.c releng/11.1/usr.sbin/bhyve/dbgport.c releng/11.1/usr.sbin/bhyve/mevent.c releng/11.1/usr.sbin/bhyve/pci_e82545.c releng/11.1/usr.sbin/bhyve/pci_passthru.c releng/11.1/usr.sbin/bhyve/pci_virtio_net.c releng/11.1/usr.sbin/bhyve/pci_virtio_rnd.c releng/11.1/usr.sbin/bhyve/rfb.c releng/11.1/usr.sbin/bhyve/uart_emul.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/lib/libvmmapi/vmmapi.c ============================================================================== --- releng/11.1/lib/libvmmapi/vmmapi.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/lib/libvmmapi/vmmapi.c Thu Jul 13 07:55:00 2017 (r320934) @@ -1416,3 +1416,45 @@ vm_restart_instruction(void *arg, int vcpu) return (ioctl(ctx->fd, VM_RESTART_INSTRUCTION, &vcpu)); } + +int +vm_get_device_fd(struct vmctx *ctx) +{ + + return (ctx->fd); +} + +const cap_ioctl_t * +vm_get_ioctls(size_t *len) +{ + cap_ioctl_t *cmds; + /* keep in sync with machine/vmm_dev.h */ + static const cap_ioctl_t vm_ioctl_cmds[] = { VM_RUN, VM_SUSPEND, VM_REINIT, + VM_ALLOC_MEMSEG, VM_GET_MEMSEG, VM_MMAP_MEMSEG, VM_MMAP_MEMSEG, + VM_MMAP_GETNEXT, VM_SET_REGISTER, VM_GET_REGISTER, + VM_SET_SEGMENT_DESCRIPTOR, VM_GET_SEGMENT_DESCRIPTOR, + VM_INJECT_EXCEPTION, VM_LAPIC_IRQ, VM_LAPIC_LOCAL_IRQ, + VM_LAPIC_MSI, VM_IOAPIC_ASSERT_IRQ, VM_IOAPIC_DEASSERT_IRQ, + VM_IOAPIC_PULSE_IRQ, VM_IOAPIC_PINCOUNT, VM_ISA_ASSERT_IRQ, + VM_ISA_DEASSERT_IRQ, VM_ISA_PULSE_IRQ, VM_ISA_SET_IRQ_TRIGGER, + VM_SET_CAPABILITY, VM_GET_CAPABILITY, VM_BIND_PPTDEV, + VM_UNBIND_PPTDEV, VM_MAP_PPTDEV_MMIO, VM_PPTDEV_MSI, + VM_PPTDEV_MSIX, VM_INJECT_NMI, VM_STATS, VM_STAT_DESC, + VM_SET_X2APIC_STATE, VM_GET_X2APIC_STATE, + VM_GET_HPET_CAPABILITIES, VM_GET_GPA_PMAP, VM_GLA2GPA, + VM_ACTIVATE_CPU, VM_GET_CPUS, VM_SET_INTINFO, VM_GET_INTINFO, + VM_RTC_WRITE, VM_RTC_READ, VM_RTC_SETTIME, VM_RTC_GETTIME, + VM_RESTART_INSTRUCTION }; + + if (len == NULL) { + cmds = malloc(sizeof(vm_ioctl_cmds)); + if (cmds == NULL) + return (NULL); + bcopy(vm_ioctl_cmds, cmds, sizeof(vm_ioctl_cmds)); + return (cmds); + } + + *len = nitems(vm_ioctl_cmds); + return (NULL); +} + Modified: releng/11.1/lib/libvmmapi/vmmapi.h ============================================================================== --- releng/11.1/lib/libvmmapi/vmmapi.h Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/lib/libvmmapi/vmmapi.h Thu Jul 13 07:55:00 2017 (r320934) @@ -36,7 +36,7 @@ * API version for out-of-tree consumers like grub-bhyve for making compile * time decisions. */ -#define VMMAPI_VERSION 0102 /* 2 digit major followed by 2 digit minor */ +#define VMMAPI_VERSION 0103 /* 2 digit major followed by 2 digit minor */ struct iovec; struct vmctx; @@ -102,6 +102,7 @@ int vm_mmap_memseg(struct vmctx *ctx, vm_paddr_t gpa, vm_ooffset_t segoff, size_t len, int prot); int vm_create(const char *name); +int vm_get_device_fd(struct vmctx *ctx); struct vmctx *vm_open(const char *name); void vm_destroy(struct vmctx *ctx); int vm_parse_memsize(const char *optarg, size_t *memsize); @@ -161,6 +162,8 @@ int vm_setup_pptdev_msix(struct vmctx *ctx, int vcpu, int vm_get_intinfo(struct vmctx *ctx, int vcpu, uint64_t *i1, uint64_t *i2); int vm_set_intinfo(struct vmctx *ctx, int vcpu, uint64_t exit_intinfo); + +const cap_ioctl_t *vm_get_ioctls(size_t *len); /* * Return a pointer to the statistics buffer. Note that this is not MT-safe. Modified: releng/11.1/usr.sbin/bhyve/bhyverun.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/bhyverun.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/bhyverun.c Thu Jul 13 07:55:00 2017 (r320934) @@ -30,6 +30,9 @@ __FBSDID("$FreeBSD$"); #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include @@ -40,6 +43,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -48,8 +52,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifndef WITHOUT_CAPSICUM +#include +#include +#endif #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include "bhyverun.h" @@ -152,7 +163,44 @@ usage(int code) exit(code); } +#ifndef WITHOUT_CAPSICUM +/* + * 11-stable capsicum helpers + */ +static void +bhyve_caph_cache_catpages(void) +{ + + (void)catopen("libc", NL_CAT_LOCALE); +} + static int +bhyve_caph_limit_stdoe(void) +{ + cap_rights_t rights; + unsigned long cmds[] = { TIOCGETA, TIOCGWINSZ }; + int i, fds[] = { STDOUT_FILENO, STDERR_FILENO }; + + cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_IOCTL); + cap_rights_set(&rights, CAP_WRITE); + + for (i = 0; i < nitems(fds); i++) { + if (cap_rights_limit(fds[i], &rights) < 0 && errno != ENOSYS) + return (-1); + + if (cap_ioctls_limit(fds[i], cmds, nitems(cmds)) < 0 && errno != ENOSYS) + return (-1); + + if (cap_fcntls_limit(fds[i], CAP_FCNTL_GETFL) < 0 && errno != ENOSYS) + return (-1); + } + + return (0); +} + +#endif + +static int pincpu_parse(const char *opt) { int vcpu, pcpu; @@ -706,6 +754,11 @@ do_open(const char *vmname) struct vmctx *ctx; int error; bool reinit, romboot; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; + const cap_ioctl_t *cmds; + size_t ncmds; +#endif reinit = romboot = false; @@ -744,6 +797,21 @@ do_open(const char *vmname) exit(1); } +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_IOCTL, CAP_MMAP_RW); + if (cap_rights_limit(vm_get_device_fd(ctx), &rights) == -1 && + errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + vm_get_ioctls(&ncmds); + cmds = vm_get_ioctls(NULL); + if (cmds == NULL) + errx(EX_OSERR, "out of memory"); + if (cap_ioctls_limit(vm_get_device_fd(ctx), cmds, ncmds) == -1 && + errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + free((cap_ioctl_t *)cmds); +#endif + if (reinit) { error = vm_reinit(ctx); if (error) { @@ -951,6 +1019,16 @@ main(int argc, char *argv[]) if (lpc_bootrom()) fwctl_init(); + +#ifndef WITHOUT_CAPSICUM + + + if (bhyve_caph_limit_stdoe() == -1) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + + if (cap_enter() == -1 && errno != ENOSYS) + errx(EX_OSERR, "cap_enter() failed"); +#endif /* * Change the proc title to include the VM name. Modified: releng/11.1/usr.sbin/bhyve/block_if.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/block_if.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/block_if.c Thu Jul 13 07:55:00 2017 (r320934) @@ -30,6 +30,9 @@ __FBSDID("$FreeBSD$"); #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include #include @@ -45,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -400,6 +404,10 @@ blockif_open(const char *optstr, const char *ident) off_t size, psectsz, psectoff; int extra, fd, i, sectsz; int nocache, sync, ro, candelete, geom, ssopt, pssopt; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; + cap_ioctl_t cmds[] = { DIOCGFLUSH, DIOCGDELETE }; +#endif pthread_once(&blockif_once, blockif_init); @@ -457,6 +465,16 @@ blockif_open(const char *optstr, const char *ident) goto err; } +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_FSYNC, CAP_IOCTL, CAP_READ, CAP_SEEK, + CAP_WRITE); + if (ro) + cap_rights_clear(&rights, CAP_FSYNC, CAP_WRITE); + + if (cap_rights_limit(fd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif + /* * Deal with raw devices */ @@ -482,6 +500,11 @@ blockif_open(const char *optstr, const char *ident) geom = 1; } else psectsz = sbuf.st_blksize; + +#ifndef WITHOUT_CAPSICUM + if (cap_ioctls_limit(fd, cmds, nitems(cmds)) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif if (ssopt != 0) { if (!powerof2(ssopt) || !powerof2(pssopt) || ssopt < 512 || Modified: releng/11.1/usr.sbin/bhyve/consport.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/consport.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/consport.c Thu Jul 13 07:55:00 2017 (r320934) @@ -30,13 +30,19 @@ __FBSDID("$FreeBSD$"); #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include +#include +#include #include #include #include #include #include +#include #include "inout.h" #include "pci_lpc.h" @@ -104,6 +110,10 @@ console_handler(struct vmctx *ctx, int vcpu, int in, i uint32_t *eax, void *arg) { static int opened; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; + cap_ioctl_t cmds[] = { TIOCGETA, TIOCSETA, TIOCGWINSZ }; +#endif if (bytes == 2 && in) { *eax = BVM_CONS_SIG; @@ -123,6 +133,13 @@ console_handler(struct vmctx *ctx, int vcpu, int in, i return (-1); if (!opened) { +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_EVENT, CAP_IOCTL, CAP_READ, CAP_WRITE); + if (cap_rights_limit(STDIN_FILENO, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + if (cap_ioctls_limit(STDIN_FILENO, cmds, nitems(cmds)) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif ttyopen(); opened = 1; } Modified: releng/11.1/usr.sbin/bhyve/dbgport.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/dbgport.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/dbgport.c Thu Jul 13 07:55:00 2017 (r320934) @@ -30,13 +30,18 @@ __FBSDID("$FreeBSD$"); #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include #include #include +#include #include #include +#include #include #include #include @@ -125,6 +130,9 @@ void init_dbgport(int sport) { int reuse; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; +#endif conn_fd = -1; @@ -154,6 +162,12 @@ init_dbgport(int sport) perror("listen"); exit(1); } + +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_ACCEPT, CAP_READ, CAP_WRITE); + if (cap_rights_limit(listen_fd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif register_inout(&dbgport); } Modified: releng/11.1/usr.sbin/bhyve/mevent.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/mevent.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/mevent.c Thu Jul 13 07:55:00 2017 (r320934) @@ -35,13 +35,18 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include #include +#include #include #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include @@ -401,6 +406,9 @@ mevent_dispatch(void) int mfd; int numev; int ret; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; +#endif mevent_tid = pthread_self(); mevent_set_name(); @@ -408,6 +416,12 @@ mevent_dispatch(void) mfd = kqueue(); assert(mfd > 0); +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_KQUEUE); + if (cap_rights_limit(mfd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif + /* * Open the pipe that will be used for other threads to force * the blocking kqueue call to exit by writing to it. Set the @@ -418,6 +432,14 @@ mevent_dispatch(void) perror("pipe"); exit(0); } + +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_EVENT, CAP_READ, CAP_WRITE); + if (cap_rights_limit(mevent_pipefd[0], &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + if (cap_rights_limit(mevent_pipefd[1], &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif /* * Add internal event handler for the pipe write fd Modified: releng/11.1/usr.sbin/bhyve/pci_e82545.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/pci_e82545.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/pci_e82545.c Thu Jul 13 07:55:00 2017 (r320934) @@ -31,6 +31,9 @@ __FBSDID("$FreeBSD$"); #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include #include @@ -38,12 +41,14 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -2202,6 +2207,9 @@ static void e82545_open_tap(struct e82545_softc *sc, char *opts) { char tbuf[80]; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; +#endif if (opts == NULL) { sc->esc_tapfd = -1; @@ -2228,6 +2236,12 @@ e82545_open_tap(struct e82545_softc *sc, char *opts) sc->esc_tapfd = -1; } +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_EVENT, CAP_READ, CAP_WRITE); + if (cap_rights_limit(sc->esc_tapfd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif + sc->esc_mevp = mevent_add(sc->esc_tapfd, EVF_READ, e82545_tap_callback, Modified: releng/11.1/usr.sbin/bhyve/pci_passthru.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/pci_passthru.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/pci_passthru.c Thu Jul 13 07:55:00 2017 (r320934) @@ -30,6 +30,9 @@ __FBSDID("$FreeBSD$"); #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include #include @@ -44,7 +47,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include +#include #include #include @@ -639,10 +644,19 @@ passthru_init(struct vmctx *ctx, struct pci_devinst *p { int bus, slot, func, error, memflags; struct passthru_softc *sc; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; + cap_ioctl_t pci_ioctls[] = { PCIOCREAD, PCIOCWRITE, PCIOCGETBAR }; + cap_ioctl_t io_ioctls[] = { IODEV_PIO }; +#endif sc = NULL; error = 1; +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_IOCTL, CAP_READ, CAP_WRITE); +#endif + memflags = vm_get_memflags(ctx); if (!(memflags & VM_MEM_F_WIRED)) { warnx("passthru requires guest memory to be wired"); @@ -657,6 +671,13 @@ passthru_init(struct vmctx *ctx, struct pci_devinst *p } } +#ifndef WITHOUT_CAPSICUM + if (cap_rights_limit(pcifd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + if (cap_ioctls_limit(pcifd, pci_ioctls, nitems(pci_ioctls)) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif + if (iofd < 0) { iofd = open(_PATH_DEVIO, O_RDWR, 0); if (iofd < 0) { @@ -665,6 +686,13 @@ passthru_init(struct vmctx *ctx, struct pci_devinst *p } } +#ifndef WITHOUT_CAPSICUM + if (cap_rights_limit(iofd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + if (cap_ioctls_limit(iofd, io_ioctls, nitems(io_ioctls)) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif + if (memfd < 0) { memfd = open(_PATH_MEM, O_RDWR, 0); if (memfd < 0) { @@ -672,6 +700,13 @@ passthru_init(struct vmctx *ctx, struct pci_devinst *p goto done; } } + +#ifndef WITHOUT_CAPSICUM + cap_rights_clear(&rights, CAP_IOCTL); + cap_rights_set(&rights, CAP_MMAP_RW); + if (cap_rights_limit(memfd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif if (opts == NULL || sscanf(opts, "%d/%d/%d", &bus, &slot, &func) != 3) { Modified: releng/11.1/usr.sbin/bhyve/pci_virtio_net.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/pci_virtio_net.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/pci_virtio_net.c Thu Jul 13 07:55:00 2017 (r320934) @@ -30,6 +30,9 @@ __FBSDID("$FreeBSD$"); #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include #include @@ -41,6 +44,7 @@ __FBSDID("$FreeBSD$"); #endif #include +#include #include #include #include @@ -53,6 +57,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "bhyverun.h" #include "pci_emul.h" @@ -743,6 +748,9 @@ static void pci_vtnet_tap_setup(struct pci_vtnet_softc *sc, char *devname) { char tbuf[80]; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; +#endif strcpy(tbuf, "/dev/"); strlcat(tbuf, devname, sizeof(tbuf)); @@ -766,6 +774,12 @@ pci_vtnet_tap_setup(struct pci_vtnet_softc *sc, char * close(sc->vsc_tapfd); sc->vsc_tapfd = -1; } + +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_EVENT, CAP_READ, CAP_WRITE); + if (cap_rights_limit(sc->vsc_tapfd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif sc->vsc_mevp = mevent_add(sc->vsc_tapfd, EVF_READ, Modified: releng/11.1/usr.sbin/bhyve/pci_virtio_rnd.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/pci_virtio_rnd.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/pci_virtio_rnd.c Thu Jul 13 07:55:00 2017 (r320934) @@ -35,9 +35,13 @@ __FBSDID("$FreeBSD$"); #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include +#include #include #include #include @@ -46,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "bhyverun.h" #include "pci_emul.h" @@ -138,6 +143,9 @@ pci_vtrnd_init(struct vmctx *ctx, struct pci_devinst * int fd; int len; uint8_t v; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; +#endif /* * Should always be able to open /dev/random. @@ -145,6 +153,12 @@ pci_vtrnd_init(struct vmctx *ctx, struct pci_devinst * fd = open("/dev/random", O_RDONLY | O_NONBLOCK); assert(fd >= 0); + +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_READ); + if (cap_rights_limit(fd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif /* * Check that device is seeded and non-blocking. Modified: releng/11.1/usr.sbin/bhyve/rfb.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/rfb.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/rfb.c Thu Jul 13 07:55:00 2017 (r320934) @@ -29,6 +29,9 @@ __FBSDID("$FreeBSD$"); #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include #include @@ -38,6 +41,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include #include #include #include @@ -45,6 +50,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -868,6 +874,9 @@ rfb_init(char *hostname, int port, int wait) struct rfb_softc *rc; struct sockaddr_in sin; int on = 1; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; +#endif rc = calloc(1, sizeof(struct rfb_softc)); @@ -903,6 +912,12 @@ rfb_init(char *hostname, int port, int wait) perror("listen"); return (-1); } + +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_ACCEPT, CAP_EVENT, CAP_READ, CAP_WRITE); + if (cap_rights_limit(rc->sfd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); +#endif rc->hw_crc = sse42_supported(); Modified: releng/11.1/usr.sbin/bhyve/uart_emul.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/uart_emul.c Thu Jul 13 07:32:55 2017 (r320933) +++ releng/11.1/usr.sbin/bhyve/uart_emul.c Thu Jul 13 07:55:00 2017 (r320934) @@ -32,16 +32,22 @@ __FBSDID("$FreeBSD$"); #include #include +#ifndef WITHOUT_CAPSICUM +#include +#endif #include #include #include +#include +#include #include #include #include #include #include #include +#include #include "mevent.h" #include "uart_emul.h" @@ -638,7 +644,7 @@ uart_tty_backend(struct uart_softc *sc, const char *op sc->tty.opened = true; retval = 0; } - + return (retval); } @@ -646,6 +652,11 @@ int uart_set_backend(struct uart_softc *sc, const char *opts) { int retval; +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; + cap_ioctl_t cmds[] = { TIOCGETA, TIOCSETA, TIOCGWINSZ }; + cap_ioctl_t sicmds[] = { TIOCGETA, TIOCGWINSZ }; +#endif retval = -1; @@ -666,6 +677,23 @@ uart_set_backend(struct uart_softc *sc, const char *op /* Make the backend file descriptor non-blocking */ if (retval == 0) retval = fcntl(sc->tty.fd, F_SETFL, O_NONBLOCK); + +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_EVENT, CAP_IOCTL, CAP_READ, CAP_WRITE); + if (cap_rights_limit(sc->tty.fd, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + if (cap_ioctls_limit(sc->tty.fd, cmds, nitems(cmds)) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + if (!uart_stdio) { + cap_rights_init(&rights, CAP_FCNTL, CAP_FSTAT, CAP_IOCTL, CAP_READ); + if (cap_rights_limit(STDIN_FILENO, &rights) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + if (cap_ioctls_limit(STDIN_FILENO, sicmds, nitems(sicmds)) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + if (cap_fcntls_limit(STDIN_FILENO, CAP_FCNTL_GETFL) == -1 && errno != ENOSYS) + errx(EX_OSERR, "Unable to apply rights for sandbox"); + } +#endif if (retval == 0) uart_opentty(sc); From owner-svn-src-releng@freebsd.org Thu Jul 13 08:13:30 2017 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 7835ED9B218; Thu, 13 Jul 2017 08:13:30 +0000 (UTC) (envelope-from grehan@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 44A4E6E196; Thu, 13 Jul 2017 08:13:30 +0000 (UTC) (envelope-from grehan@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6D8DTt1055259; Thu, 13 Jul 2017 08:13:29 GMT (envelope-from grehan@FreeBSD.org) Received: (from grehan@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6D8DT14055256; Thu, 13 Jul 2017 08:13:29 GMT (envelope-from grehan@FreeBSD.org) Message-Id: <201707130813.v6D8DT14055256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: grehan set sender to grehan@FreeBSD.org using -f From: Peter Grehan Date: Thu, 13 Jul 2017 08:13:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320935 - releng/11.1/usr.sbin/bhyve X-SVN-Group: releng X-SVN-Commit-Author: grehan X-SVN-Commit-Paths: releng/11.1/usr.sbin/bhyve X-SVN-Commit-Revision: 320935 X-SVN-Commit-Repository: base 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: Thu, 13 Jul 2017 08:13:30 -0000 Author: grehan Date: Thu Jul 13 08:13:29 2017 New Revision: 320935 URL: https://svnweb.freebsd.org/changeset/base/320935 Log: MFS 320891 MFC r317542, r317543, r317543 317542 comment fix 317543 set rfb default port 317543 listen on localhost by default for rfb Approved by: re (kib) Modified: releng/11.1/usr.sbin/bhyve/pci_fbuf.c releng/11.1/usr.sbin/bhyve/pci_xhci.c releng/11.1/usr.sbin/bhyve/rfb.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/usr.sbin/bhyve/pci_fbuf.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/pci_fbuf.c Thu Jul 13 07:55:00 2017 (r320934) +++ releng/11.1/usr.sbin/bhyve/pci_fbuf.c Thu Jul 13 08:13:29 2017 (r320935) @@ -55,7 +55,7 @@ __FBSDID("$FreeBSD$"); * BAR0 points to the current mode information. * BAR1 is the 32-bit framebuffer address. * - * -s ,fbuf,wait,tcp=:port,w=width,h=height + * -s ,fbuf,wait,vga=on|io|off,rfb=:port,w=width,h=height */ static int fbuf_debug = 1; Modified: releng/11.1/usr.sbin/bhyve/pci_xhci.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/pci_xhci.c Thu Jul 13 07:55:00 2017 (r320934) +++ releng/11.1/usr.sbin/bhyve/pci_xhci.c Thu Jul 13 08:13:29 2017 (r320935) @@ -28,7 +28,7 @@ -s ,xhci,{devices} devices: - ums USB tablet mouse + tablet USB tablet mouse */ #include __FBSDID("$FreeBSD$"); Modified: releng/11.1/usr.sbin/bhyve/rfb.c ============================================================================== --- releng/11.1/usr.sbin/bhyve/rfb.c Thu Jul 13 07:55:00 2017 (r320934) +++ releng/11.1/usr.sbin/bhyve/rfb.c Thu Jul 13 08:13:29 2017 (r320935) @@ -897,11 +897,11 @@ rfb_init(char *hostname, int port, int wait) sin.sin_len = sizeof(sin); sin.sin_family = AF_INET; - sin.sin_port = htons(port); + sin.sin_port = port ? htons(port) : htons(5900); if (hostname && strlen(hostname) > 0) inet_pton(AF_INET, hostname, &(sin.sin_addr)); else - sin.sin_addr.s_addr = htonl(INADDR_ANY); + sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK); if (bind(rc->sfd, (struct sockaddr *)&sin, sizeof(sin)) < 0) { perror("bind"); From owner-svn-src-releng@freebsd.org Thu Jul 13 15:54:27 2017 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 DA248DA7460; Thu, 13 Jul 2017 15:54:27 +0000 (UTC) (envelope-from hselasky@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 A74837D4E1; Thu, 13 Jul 2017 15:54:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6DFsQCN044491; Thu, 13 Jul 2017 15:54:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6DFsQEF044490; Thu, 13 Jul 2017 15:54:26 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201707131554.v6DFsQEF044490@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Thu, 13 Jul 2017 15:54:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320949 - releng/11.1/sys/ofed/drivers/net/mlx4 X-SVN-Group: releng X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: releng/11.1/sys/ofed/drivers/net/mlx4 X-SVN-Commit-Revision: 320949 X-SVN-Commit-Repository: base 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: Thu, 13 Jul 2017 15:54:28 -0000 Author: hselasky Date: Thu Jul 13 15:54:26 2017 New Revision: 320949 URL: https://svnweb.freebsd.org/changeset/base/320949 Log: MF11 r320947; MFC r320876: Make sure the mlx4en RX DMA ring gets stamped with software ownership in order to prevent the flow of QP to error in the firmware once UPDATE_QP is called. Approved by: re (marius) Sponsored by: Mellanox Technologies Modified: releng/11.1/sys/ofed/drivers/net/mlx4/en_rx.c Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/sys/ofed/drivers/net/mlx4/en_rx.c ============================================================================== --- releng/11.1/sys/ofed/drivers/net/mlx4/en_rx.c Thu Jul 13 15:33:08 2017 (r320948) +++ releng/11.1/sys/ofed/drivers/net/mlx4/en_rx.c Thu Jul 13 15:54:26 2017 (r320949) @@ -394,8 +394,14 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *pri ring->rx_mb_size = priv->rx_mb_size; ring->stride = stride; - if (ring->stride <= TXBB_SIZE) + if (ring->stride <= TXBB_SIZE) { + /* Stamp first unused send wqe */ + __be32 *ptr = (__be32 *)ring->buf; + __be32 stamp = cpu_to_be32(1 << STAMP_SHIFT); + *ptr = stamp; + /* Move pointer to start of rx section */ ring->buf += TXBB_SIZE; + } ring->log_stride = ffs(ring->stride) - 1; ring->buf_size = ring->size * ring->stride; From owner-svn-src-releng@freebsd.org Thu Jul 13 16:23:46 2017 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 2483FDA7E64; Thu, 13 Jul 2017 16:23:46 +0000 (UTC) (envelope-from gjb@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 DF1527E694; Thu, 13 Jul 2017 16:23:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6DGNj7s057103; Thu, 13 Jul 2017 16:23:45 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6DGNjp5057102; Thu, 13 Jul 2017 16:23:45 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201707131623.v6DGNjp5057102@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 13 Jul 2017 16:23:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320951 - releng/11.1/release/doc/share/xml X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.1/release/doc/share/xml X-SVN-Commit-Revision: 320951 X-SVN-Commit-Repository: base 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: Thu, 13 Jul 2017 16:23:46 -0000 Author: gjb Date: Thu Jul 13 16:23:44 2017 New Revision: 320951 URL: https://svnweb.freebsd.org/changeset/base/320951 Log: Document SA-17:05.heimdal. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/11.1/release/doc/share/xml/security.xml Modified: releng/11.1/release/doc/share/xml/security.xml ============================================================================== --- releng/11.1/release/doc/share/xml/security.xml Thu Jul 13 16:18:46 2017 (r320950) +++ releng/11.1/release/doc/share/xml/security.xml Thu Jul 13 16:23:44 2017 (r320951) @@ -90,6 +90,14 @@ 27 April 2017 Fix fragment handling panic + + + FreeBSD-SA-17:05.heimdal + 12 July 2017 + Fix KDC-REP service name validation + vulnerability + From owner-svn-src-releng@freebsd.org Thu Jul 13 16:27:45 2017 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 1BE3DDA7F5E; Thu, 13 Jul 2017 16:27:45 +0000 (UTC) (envelope-from gjb@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 DE94D7E871; Thu, 13 Jul 2017 16:27:44 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6DGRiRP057272; Thu, 13 Jul 2017 16:27:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6DGRigZ057271; Thu, 13 Jul 2017 16:27:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201707131627.v6DGRigZ057271@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 13 Jul 2017 16:27:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320952 - releng/11.1/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.1/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 320952 X-SVN-Commit-Repository: base 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: Thu, 13 Jul 2017 16:27:45 -0000 Author: gjb Date: Thu Jul 13 16:27:43 2017 New Revision: 320952 URL: https://svnweb.freebsd.org/changeset/base/320952 Log: Document pkg(8) version 1.10.1. Prune empty sections. Remove a stale comment. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jul 13 16:23:44 2017 (r320951) +++ releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jul 13 16:27:43 2017 (r320952) @@ -22,8 +22,6 @@ $FreeBSD$ - - 2017 The &os; Documentation @@ -912,48 +910,11 @@ Collection, package infrastructure, and package maintenance and installation tools. - - Infrastructure Changes - -   - - Packaging Changes -   - - - - - Documentation - - This section covers changes to the &os; Documentation - Project sources and toolchain. - - - Documentation Source Changes - -   - - - - Documentation Toolchain Changes - -   - - - - - Release Engineering and Integration - - This section convers changes that are specific to the - &os; Release Engineering processes. - - - Integration Changes - -   + The &man.pkg.8; utility has been updated to version + 1.10.1. From owner-svn-src-releng@freebsd.org Thu Jul 13 17:05:59 2017 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 C052DDA8F7A; Thu, 13 Jul 2017 17:05:59 +0000 (UTC) (envelope-from jhb@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 9C73C800D5; Thu, 13 Jul 2017 17:05:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6DH5wBX074091; Thu, 13 Jul 2017 17:05:58 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6DH5vqh074074; Thu, 13 Jul 2017 17:05:57 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201707131705.v6DH5vqh074074@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Thu, 13 Jul 2017 17:05:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320954 - in releng/11.1: share/man/man4 share/man/man4/man4.i386 sys/dev/digi sys/dev/ie sys/dev/mcd sys/dev/scd sys/dev/si sys/dev/wl sys/i386/isa usr.sbin/sicontrol usr.sbin/wlconfig X-SVN-Group: releng X-SVN-Commit-Author: jhb X-SVN-Commit-Paths: in releng/11.1: share/man/man4 share/man/man4/man4.i386 sys/dev/digi sys/dev/ie sys/dev/mcd sys/dev/scd sys/dev/si sys/dev/wl sys/i386/isa usr.sbin/sicontrol usr.sbin/wlconfig X-SVN-Commit-Revision: 320954 X-SVN-Commit-Repository: base 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: Thu, 13 Jul 2017 17:05:59 -0000 Author: jhb Date: Thu Jul 13 17:05:57 2017 New Revision: 320954 URL: https://svnweb.freebsd.org/changeset/base/320954 Log: MFS11 320921: Add deprecation notices for various device drivers removed in 12.0. Approved by: re (kib) Modified: releng/11.1/share/man/man4/digi.4 releng/11.1/share/man/man4/man4.i386/ie.4 releng/11.1/share/man/man4/man4.i386/wl.4 releng/11.1/share/man/man4/mcd.4 releng/11.1/share/man/man4/scd.4 releng/11.1/share/man/man4/si.4 releng/11.1/share/man/man4/spic.4 releng/11.1/sys/dev/digi/digi.c releng/11.1/sys/dev/ie/if_ie.c releng/11.1/sys/dev/mcd/mcd.c releng/11.1/sys/dev/scd/scd.c releng/11.1/sys/dev/si/si.c releng/11.1/sys/dev/wl/if_wl.c releng/11.1/sys/i386/isa/spic.c releng/11.1/usr.sbin/sicontrol/sicontrol.8 releng/11.1/usr.sbin/wlconfig/wlconfig.8 Directory Properties: releng/11.1/ (props changed) Modified: releng/11.1/share/man/man4/digi.4 ============================================================================== --- releng/11.1/share/man/man4/digi.4 Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/share/man/man4/digi.4 Thu Jul 13 17:05:57 2017 (r320954) @@ -33,7 +33,7 @@ .\" from: sio.4,v 1.15 1994/12/06 20:14:30 bde Exp .\" $FreeBSD$ .\" -.Dd December 7, 2003 +.Dd July 8, 2017 .Dt DIGI 4 .Os .Sh NAME @@ -80,6 +80,11 @@ Device numbering: \fBI\fPnitial \fBPPPPP\fPort number .Ed +.Sh DEPRECATION NOTICE +The +.Nm +driver will be removed in +.Fx 12.0 . .Sh DESCRIPTION The .Nm Modified: releng/11.1/share/man/man4/man4.i386/ie.4 ============================================================================== --- releng/11.1/share/man/man4/man4.i386/ie.4 Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/share/man/man4/man4.i386/ie.4 Thu Jul 13 17:05:57 2017 (r320954) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 16, 2005 +.Dd July 8, 2017 .Dt IE 4 i386 .Os .Sh NAME @@ -52,6 +52,11 @@ In .Cd hint.ie.0.port="0x300" .Cd hint.ie.0.irq="5" .Cd hint.ie.0.maddr="0xd0000" +.Sh DEPRECATION NOTICE +The +.Nm +driver will be removed in +.Fx 12.0 . .Sh HARDWARE The .Nm Modified: releng/11.1/share/man/man4/man4.i386/wl.4 ============================================================================== --- releng/11.1/share/man/man4/man4.i386/wl.4 Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/share/man/man4/man4.i386/wl.4 Thu Jul 13 17:05:57 2017 (r320954) @@ -29,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd September 29, 2006 +.Dd July 8, 2017 .Dt WL 4 i386 .Os .Sh NAME @@ -37,6 +37,11 @@ .Nd T1 speed ISA/radio lan card .Sh SYNOPSIS .Cd "device wl0 at isa? port 0x300 irq 5" +.Sh DEPRECATION NOTICE +The +.Nm +driver will be removed in +.Fx 12.0 . .Sh DESCRIPTION The .Nm Modified: releng/11.1/share/man/man4/mcd.4 ============================================================================== --- releng/11.1/share/man/man4/mcd.4 Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/share/man/man4/mcd.4 Thu Jul 13 17:05:57 2017 (r320954) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 8, 1994 +.Dd July 8, 2017 .Dt MCD 4 .Os .Sh NAME @@ -40,6 +40,11 @@ In .Cd hint.mcd.0.at="isa" .Cd hint.mcd.0.port="0x300" .Cd hint.mcd.0.irq="10" +.Sh DEPRECATION NOTICE +The +.Nm +driver will be removed in +.Fx 12.0 . .Sh DESCRIPTION The .Nm Modified: releng/11.1/share/man/man4/scd.4 ============================================================================== --- releng/11.1/share/man/man4/scd.4 Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/share/man/man4/scd.4 Thu Jul 13 17:05:57 2017 (r320954) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 17, 2008 +.Dd July 8, 2017 .Dt SCD 4 .Os .Sh NAME @@ -39,6 +39,11 @@ In .Pa /boot/device.hints : .Cd hint.scd.0.at="isa" .Cd hint.scd.0.port="0x230" +.Sh DEPRECATION NOTICE +The +.Nm +driver will be removed in +.Fx 12.0 . .Sh DESCRIPTION The .Nm Modified: releng/11.1/share/man/man4/si.4 ============================================================================== --- releng/11.1/share/man/man4/si.4 Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/share/man/man4/si.4 Thu Jul 13 17:05:57 2017 (r320954) @@ -1,5 +1,5 @@ .\" $FreeBSD$ -.Dd September 16, 1995 +.Dd July 8, 2017 .Dt SI 4 .Os .Sh NAME @@ -13,6 +13,11 @@ For ISA host cards put the following lines in .Cd hint.si.0.at="isa" .Cd hint.si.0.maddr="0xd0000" .Cd hint.si.0.irq="12" +.Sh DEPRECATION NOTICE +The +.Nm +driver will be removed in +.Fx 12.0 . .Sh DESCRIPTION The Specialix SI/XIO and SX hardware makes up an 8 to 32 port RS-232 serial multiplexor. Modified: releng/11.1/share/man/man4/spic.4 ============================================================================== --- releng/11.1/share/man/man4/spic.4 Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/share/man/man4/spic.4 Thu Jul 13 17:05:57 2017 (r320954) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 20, 2002 +.Dd July 8, 2017 .Dt SPIC 4 .Os .Sh NAME @@ -33,6 +33,11 @@ .Nd Sony Programmable I/O Controller device driver .Sh SYNOPSIS .Cd "device spic" +.Sh DEPRECATION NOTICE +The +.Nm +driver will be removed in +.Fx 12.0 . .Sh DESCRIPTION The .Nm Modified: releng/11.1/sys/dev/digi/digi.c ============================================================================== --- releng/11.1/sys/dev/digi/digi.c Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/sys/dev/digi/digi.c Thu Jul 13 17:05:57 2017 (r320954) @@ -1458,6 +1458,8 @@ digi_attach(struct digi_softc *sc) digi_loadmoduledata(sc); digi_init(sc); digi_freemoduledata(sc); + device_printf(dev, + "WARNING: This driver is deprecated and will be removed.\n"); return (0); } Modified: releng/11.1/sys/dev/ie/if_ie.c ============================================================================== --- releng/11.1/sys/dev/ie/if_ie.c Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/sys/dev/ie/if_ie.c Thu Jul 13 17:05:57 2017 (r320954) @@ -327,6 +327,8 @@ ie_attach(device_t dev) mtx_destroy(&sc->lock); return (error); } + device_printf(dev, + "WARNING: This driver is deprecated and will be removed.\n"); return (0); } Modified: releng/11.1/sys/dev/mcd/mcd.c ============================================================================== --- releng/11.1/sys/dev/mcd/mcd.c Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/sys/dev/mcd/mcd.c Thu Jul 13 17:05:57 2017 (r320954) @@ -209,6 +209,8 @@ mcd_attach(struct mcd_softc *sc) sc->mcd_dev_t->si_drv1 = (void *)sc; callout_init_mtx(&sc->timer, &sc->mtx, 0); + device_printf(sc->dev, + "WARNING: This driver is deprecated and will be removed.\n"); return (0); } Modified: releng/11.1/sys/dev/scd/scd.c ============================================================================== --- releng/11.1/sys/dev/scd/scd.c Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/sys/dev/scd/scd.c Thu Jul 13 17:05:57 2017 (r320954) @@ -174,6 +174,8 @@ scd_attach(struct scd_softc *sc) sc->scd_dev_t = make_dev(&scd_cdevsw, 8 * unit, UID_ROOT, GID_OPERATOR, 0640, "scd%d", unit); sc->scd_dev_t->si_drv1 = (void *)sc; + device_printf(sc->dev, + "WARNING: This driver is deprecated and will be removed.\n"); return (0); } Modified: releng/11.1/sys/dev/si/si.c ============================================================================== --- releng/11.1/sys/dev/si/si.c Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/sys/dev/si/si.c Thu Jul 13 17:05:57 2017 (r320954) @@ -604,6 +604,8 @@ try_next2: if (unit == 0) make_dev(&si_Scdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "si_control"); + device_printf(dev, + "WARNING: This driver is deprecated and will be removed.\n"); return (0); } Modified: releng/11.1/sys/dev/wl/if_wl.c ============================================================================== --- releng/11.1/sys/dev/wl/if_wl.c Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/sys/dev/wl/if_wl.c Thu Jul 13 17:05:57 2017 (r320954) @@ -564,6 +564,8 @@ wlattach(device_t device) if (bootverbose) wldump(sc); + device_printf(device, + "WARNING: This driver is deprecated and will be removed.\n"); return (0); } Modified: releng/11.1/sys/i386/isa/spic.c ============================================================================== --- releng/11.1/sys/i386/isa/spic.c Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/sys/i386/isa/spic.c Thu Jul 13 17:05:57 2017 (r320954) @@ -350,6 +350,8 @@ spic_attach(device_t dev) /* There can be only one */ sc->sc_cdev = make_dev(&spic_cdevsw, 0, 0, 0, 0600, "jogdial"); sc->sc_cdev->si_drv1 = sc; + device_printf(dev, + "WARNING: This driver is deprecated and will be removed.\n"); return 0; } Modified: releng/11.1/usr.sbin/sicontrol/sicontrol.8 ============================================================================== --- releng/11.1/usr.sbin/sicontrol/sicontrol.8 Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/usr.sbin/sicontrol/sicontrol.8 Thu Jul 13 17:05:57 2017 (r320954) @@ -1,6 +1,6 @@ .\" $FreeBSD$ .\" -.Dd September 26, 1995 +.Dd July 8, 2017 .Dt SICONTROL 8 .Os .Sh NAME @@ -10,6 +10,11 @@ .Nm device .Ar command Op Ar param ... +.Sh DEPRECATION NOTICE +The +.Nm +utility will be removed in +.Fx 12.0 . .Sh DESCRIPTION The .Nm Modified: releng/11.1/usr.sbin/wlconfig/wlconfig.8 ============================================================================== --- releng/11.1/usr.sbin/wlconfig/wlconfig.8 Thu Jul 13 16:56:26 2017 (r320953) +++ releng/11.1/usr.sbin/wlconfig/wlconfig.8 Thu Jul 13 17:05:57 2017 (r320954) @@ -1,6 +1,6 @@ .\" $FreeBSD$ .\" -.Dd December 26, 1996 +.Dd July 8, 2017 .Dt WLCONFIG 8 i386 .Os .Sh NAME @@ -10,6 +10,11 @@ .Nm .Ar ifname .Op Ar param value ... +.Sh DEPRECATION NOTICE +The +.Nm +utility will be removed in +.Fx 12.0 . .Sh DESCRIPTION The .Nm From owner-svn-src-releng@freebsd.org Thu Jul 13 17:37:33 2017 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 DF9F6DA99EB; Thu, 13 Jul 2017 17:37:33 +0000 (UTC) (envelope-from gjb@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 AE509812B9; Thu, 13 Jul 2017 17:37:33 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6DHbWEt087003; Thu, 13 Jul 2017 17:37:32 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6DHbWUP087002; Thu, 13 Jul 2017 17:37:32 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201707131737.v6DHbWUP087002@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 13 Jul 2017 17:37:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320955 - releng/11.1/release/doc/en_US.ISO8859-1/relnotes X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: releng/11.1/release/doc/en_US.ISO8859-1/relnotes X-SVN-Commit-Revision: 320955 X-SVN-Commit-Repository: base 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: Thu, 13 Jul 2017 17:37:34 -0000 Author: gjb Date: Thu Jul 13 17:37:32 2017 New Revision: 320955 URL: https://svnweb.freebsd.org/changeset/base/320955 Log: Document r320954, deprecation of digi(4), ie(4), mcd(4), scd(4), si(4), spic(4), wl(4), sicontrol(8), and wlconfig(8). Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jul 13 17:05:57 2017 (r320954) +++ releng/11.1/release/doc/en_US.ISO8859-1/relnotes/article.xml Thu Jul 13 17:37:32 2017 (r320955) @@ -638,6 +638,13 @@ sponsor="&chelsio;">&man.devctl.8; now supports a "clear driver" command as a complement to "set driver". + + The &man.digi.4;, &man.ie.4;, + &man.mcd.4;, &man.scd.4;, &man.si.4;, &man.spic.4;, and + &man.wl.4; drivers have been marked as deprecated, and removed + in &os; 12.0. The associated &man.sicontrol.8; and + &man.wlconfig.8; utilities have been deprecated, as + well. From owner-svn-src-releng@freebsd.org Thu Jul 13 23:48:07 2017 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 0F0F7DB0852; Thu, 13 Jul 2017 23:48:07 +0000 (UTC) (envelope-from gjb@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 CF7E16A1B3; Thu, 13 Jul 2017 23:48:06 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6DNm6aO044483; Thu, 13 Jul 2017 23:48:06 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6DNm5iQ044481; Thu, 13 Jul 2017 23:48:05 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201707132348.v6DNm5iQ044481@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 13 Jul 2017 23:48:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r320976 - in releng/11.1: release/pkg_repos sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/11.1: release/pkg_repos sys/conf X-SVN-Commit-Revision: 320976 X-SVN-Commit-Repository: base 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: Thu, 13 Jul 2017 23:48:07 -0000 Author: gjb Date: Thu Jul 13 23:48:05 2017 New Revision: 320976 URL: https://svnweb.freebsd.org/changeset/base/320976 Log: Rename releng/11.1 to RC3 as part of the 11.1-RELEASE cycle. Use the 'release_1' package set to populate the dvd1.iso packages. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/11.1/release/pkg_repos/release-dvd.conf releng/11.1/sys/conf/newvers.sh Modified: releng/11.1/release/pkg_repos/release-dvd.conf ============================================================================== --- releng/11.1/release/pkg_repos/release-dvd.conf Thu Jul 13 22:53:13 2017 (r320975) +++ releng/11.1/release/pkg_repos/release-dvd.conf Thu Jul 13 23:48:05 2017 (r320976) @@ -1,6 +1,6 @@ # $FreeBSD$ release: { - url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly", + url: "pkg+http://pkg.FreeBSD.org/${ABI}/release_1", mirror_type: "srv", signature_type: "fingerprints", fingerprints: "/usr/share/keys/pkg", Modified: releng/11.1/sys/conf/newvers.sh ============================================================================== --- releng/11.1/sys/conf/newvers.sh Thu Jul 13 22:53:13 2017 (r320975) +++ releng/11.1/sys/conf/newvers.sh Thu Jul 13 23:48:05 2017 (r320976) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.1" -BRANCH="RC2" +BRANCH="RC3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi