From owner-svn-src-releng@freebsd.org Tue Dec 4 18:38:04 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F6BD131687F; Tue, 4 Dec 2018 18:38:04 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AA6D06AD13; Tue, 4 Dec 2018 18:38:03 +0000 (UTC) (envelope-from gordon@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7234310CE; Tue, 4 Dec 2018 18:38:03 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB4Ic3Rn084886; Tue, 4 Dec 2018 18:38:03 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB4Ic3IG084885; Tue, 4 Dec 2018 18:38:03 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201812041838.wB4Ic3IG084885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 4 Dec 2018 18:38:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r341487 - releng/12.0/usr.sbin/bhyve X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: releng/12.0/usr.sbin/bhyve X-SVN-Commit-Revision: 341487 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AA6D06AD13 X-Spamd-Result: default: False [-0.33 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.45)[-0.447,0]; NEURAL_SPAM_SHORT(0.14)[0.144,0]; NEURAL_HAM_LONG(-0.03)[-0.031,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 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, 04 Dec 2018 18:38:04 -0000 Author: gordon Date: Tue Dec 4 18:38:03 2018 New Revision: 341487 URL: https://svnweb.freebsd.org/changeset/base/341487 Log: Fix insufficient bounds checking in bhyve(8) device model. [SA-18:14.bhyve] Submitted by: jhb Reported by: Reno Robert Approved by: so Approved by: re (implicit) Security: FreeBSD-SA-18:14.bhyve Security: CVE-2018-17160 Modified: releng/12.0/usr.sbin/bhyve/fwctl.c Modified: releng/12.0/usr.sbin/bhyve/fwctl.c ============================================================================== --- releng/12.0/usr.sbin/bhyve/fwctl.c Tue Dec 4 18:32:50 2018 (r341486) +++ releng/12.0/usr.sbin/bhyve/fwctl.c Tue Dec 4 18:38:03 2018 (r341487) @@ -79,8 +79,8 @@ static u_int ident_idx; struct op_info { int op; - int (*op_start)(int len); - void (*op_data)(uint32_t data, int len); + int (*op_start)(uint32_t len); + void (*op_data)(uint32_t data, uint32_t len); int (*op_result)(struct iovec **data); void (*op_done)(struct iovec *data); }; @@ -119,7 +119,7 @@ errop_set(int err) } static int -errop_start(int len) +errop_start(uint32_t len) { errop_code = ENOENT; @@ -128,7 +128,7 @@ errop_start(int len) } static void -errop_data(uint32_t data, int len) +errop_data(uint32_t data, uint32_t len) { /* ignore */ @@ -188,7 +188,7 @@ static int fget_cnt; static size_t fget_size; static int -fget_start(int len) +fget_start(uint32_t len) { if (len > FGET_STRSZ) @@ -200,7 +200,7 @@ fget_start(int len) } static void -fget_data(uint32_t data, int len) +fget_data(uint32_t data, uint32_t len) { *((uint32_t *) &fget_str[fget_cnt]) = data; @@ -285,8 +285,8 @@ static struct req_info { struct op_info *req_op; int resp_error; int resp_count; - int resp_size; - int resp_off; + size_t resp_size; + size_t resp_off; struct iovec *resp_biov; } rinfo; @@ -346,13 +346,14 @@ fwctl_request_start(void) static int fwctl_request_data(uint32_t value) { - int remlen; /* Make sure remaining size is >= 0 */ - rinfo.req_size -= sizeof(uint32_t); - remlen = MAX(rinfo.req_size, 0); + if (rinfo.req_size <= sizeof(uint32_t)) + rinfo.req_size = 0; + else + rinfo.req_size -= sizeof(uint32_t); - (*rinfo.req_op->op_data)(value, remlen); + (*rinfo.req_op->op_data)(value, rinfo.req_size); if (rinfo.req_size < sizeof(uint32_t)) { fwctl_request_done(); @@ -401,7 +402,7 @@ static int fwctl_response(uint32_t *retval) { uint32_t *dp; - int remlen; + ssize_t remlen; switch(rinfo.resp_count) { case 0: @@ -436,7 +437,7 @@ fwctl_response(uint32_t *retval) } if (rinfo.resp_count > 3 && - rinfo.resp_size - rinfo.resp_off <= 0) { + rinfo.resp_off >= rinfo.resp_size) { fwctl_response_done(); return (1); } From owner-svn-src-releng@freebsd.org Tue Dec 4 18:38:33 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5C95713168E7; Tue, 4 Dec 2018 18:38:33 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 01CEA6AE1E; Tue, 4 Dec 2018 18:38:33 +0000 (UTC) (envelope-from gordon@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D892B10D1; Tue, 4 Dec 2018 18:38:32 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB4IcWQu084952; Tue, 4 Dec 2018 18:38:32 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB4IcWD3084949; Tue, 4 Dec 2018 18:38:32 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201812041838.wB4IcWD3084949@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Tue, 4 Dec 2018 18:38:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r341488 - in releng/11.2: . sys/conf usr.sbin/bhyve X-SVN-Group: releng X-SVN-Commit-Author: gordon X-SVN-Commit-Paths: in releng/11.2: . sys/conf usr.sbin/bhyve X-SVN-Commit-Revision: 341488 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 01CEA6AE1E X-Spamd-Result: default: False [-0.33 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.45)[-0.447,0]; NEURAL_SPAM_SHORT(0.14)[0.144,0]; NEURAL_HAM_LONG(-0.03)[-0.031,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 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, 04 Dec 2018 18:38:33 -0000 Author: gordon Date: Tue Dec 4 18:38:32 2018 New Revision: 341488 URL: https://svnweb.freebsd.org/changeset/base/341488 Log: Fix insufficient bounds checking in bhyve(8) device model. [SA-18:14.bhyve] Submitted by: jhb Reported by: Reno Robert Approved by: so Security: FreeBSD-SA-18:14.bhyve Security: CVE-2018-17160 Modified: releng/11.2/UPDATING releng/11.2/sys/conf/newvers.sh releng/11.2/usr.sbin/bhyve/fwctl.c Modified: releng/11.2/UPDATING ============================================================================== --- releng/11.2/UPDATING Tue Dec 4 18:38:03 2018 (r341487) +++ releng/11.2/UPDATING Tue Dec 4 18:38:32 2018 (r341488) @@ -16,6 +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. +20181204 p6 FreeBSD-SA-18:14.bhyve + + Fix insufficient bounds checking in bhyve(8) device model. + [SA-18:14.bhyve] + 20181127 p5 FreeBSD-SA-18:13.nfs FreeBSD-EN-18:13.icmp FreeBSD-EN-18:14.tzdata Modified: releng/11.2/sys/conf/newvers.sh ============================================================================== --- releng/11.2/sys/conf/newvers.sh Tue Dec 4 18:38:03 2018 (r341487) +++ releng/11.2/sys/conf/newvers.sh Tue Dec 4 18:38:32 2018 (r341488) @@ -44,7 +44,7 @@ TYPE="FreeBSD" REVISION="11.2" -BRANCH="RELEASE-p5" +BRANCH="RELEASE-p6" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi Modified: releng/11.2/usr.sbin/bhyve/fwctl.c ============================================================================== --- releng/11.2/usr.sbin/bhyve/fwctl.c Tue Dec 4 18:38:03 2018 (r341487) +++ releng/11.2/usr.sbin/bhyve/fwctl.c Tue Dec 4 18:38:32 2018 (r341488) @@ -77,8 +77,8 @@ static u_int ident_idx; struct op_info { int op; - int (*op_start)(int len); - void (*op_data)(uint32_t data, int len); + int (*op_start)(uint32_t len); + void (*op_data)(uint32_t data, uint32_t len); int (*op_result)(struct iovec **data); void (*op_done)(struct iovec *data); }; @@ -117,7 +117,7 @@ errop_set(int err) } static int -errop_start(int len) +errop_start(uint32_t len) { errop_code = ENOENT; @@ -126,7 +126,7 @@ errop_start(int len) } static void -errop_data(uint32_t data, int len) +errop_data(uint32_t data, uint32_t len) { /* ignore */ @@ -186,7 +186,7 @@ static int fget_cnt; static size_t fget_size; static int -fget_start(int len) +fget_start(uint32_t len) { if (len > FGET_STRSZ) @@ -198,7 +198,7 @@ fget_start(int len) } static void -fget_data(uint32_t data, int len) +fget_data(uint32_t data, uint32_t len) { *((uint32_t *) &fget_str[fget_cnt]) = data; @@ -283,8 +283,8 @@ static struct req_info { struct op_info *req_op; int resp_error; int resp_count; - int resp_size; - int resp_off; + size_t resp_size; + size_t resp_off; struct iovec *resp_biov; } rinfo; @@ -344,13 +344,14 @@ fwctl_request_start(void) static int fwctl_request_data(uint32_t value) { - int remlen; /* Make sure remaining size is >= 0 */ - rinfo.req_size -= sizeof(uint32_t); - remlen = MAX(rinfo.req_size, 0); + if (rinfo.req_size <= sizeof(uint32_t)) + rinfo.req_size = 0; + else + rinfo.req_size -= sizeof(uint32_t); - (*rinfo.req_op->op_data)(value, remlen); + (*rinfo.req_op->op_data)(value, rinfo.req_size); if (rinfo.req_size < sizeof(uint32_t)) { fwctl_request_done(); @@ -399,7 +400,7 @@ static int fwctl_response(uint32_t *retval) { uint32_t *dp; - int remlen; + ssize_t remlen; switch(rinfo.resp_count) { case 0: @@ -434,7 +435,7 @@ fwctl_response(uint32_t *retval) } if (rinfo.resp_count > 3 && - rinfo.resp_size - rinfo.resp_off <= 0) { + rinfo.resp_off >= rinfo.resp_size) { fwctl_response_done(); return (1); } From owner-svn-src-releng@freebsd.org Wed Dec 5 19:16:16 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C32B11324E67; Wed, 5 Dec 2018 19:16:15 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 53B90858AB; Wed, 5 Dec 2018 19:16:15 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 34C6518A9C; Wed, 5 Dec 2018 19:16:15 +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 wB5JGF1I060295; Wed, 5 Dec 2018 19:16:15 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB5JGDlt060284; Wed, 5 Dec 2018 19:16:13 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201812051916.wB5JGDlt060284@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Wed, 5 Dec 2018 19:16:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r341603 - in releng/12.0: sbin/savecore sys/amd64/amd64 sys/amd64/ia32 sys/arm/arm sys/fs/procfs sys/i386/i386 sys/kern sys/sparc64/sparc64 X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/12.0: sbin/savecore sys/amd64/amd64 sys/amd64/ia32 sys/arm/arm sys/fs/procfs sys/i386/i386 sys/kern sys/sparc64/sparc64 X-SVN-Commit-Revision: 341603 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 53B90858AB X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.40)[-0.399,0]; NEURAL_SPAM_SHORT(0.43)[0.426,0]; NEURAL_HAM_LONG(-0.02)[-0.024,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 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, 05 Dec 2018 19:16:16 -0000 Author: gjb Date: Wed Dec 5 19:16:12 2018 New Revision: 341603 URL: https://svnweb.freebsd.org/changeset/base/341603 Log: MFS12 r341490, r341493: r341490 (markj): MFC r341442, r341443: Plug memory disclosures via ptrace(2). r341493 (garga): MFC r341464: Restore /var/crash permissions to 0750, as declared in mtree file. After r337337 it changed to 0755. As this would have otherwise been resolved as a post-release EN/SA from so@, this does not warrant adding RC4 to the 12.0 schedule. Approved by: re (implicit), so Sponsored by: The FreeBSD Foundation Modified: releng/12.0/sbin/savecore/Makefile releng/12.0/sys/amd64/amd64/machdep.c releng/12.0/sys/amd64/ia32/ia32_reg.c releng/12.0/sys/arm/arm/machdep_kdb.c releng/12.0/sys/fs/procfs/procfs_dbregs.c releng/12.0/sys/fs/procfs/procfs_fpregs.c releng/12.0/sys/fs/procfs/procfs_regs.c releng/12.0/sys/i386/i386/machdep.c releng/12.0/sys/kern/sys_process.c releng/12.0/sys/sparc64/sparc64/machdep.c Directory Properties: releng/12.0/ (props changed) Modified: releng/12.0/sbin/savecore/Makefile ============================================================================== --- releng/12.0/sbin/savecore/Makefile Wed Dec 5 18:26:40 2018 (r341602) +++ releng/12.0/sbin/savecore/Makefile Wed Dec 5 19:16:12 2018 (r341603) @@ -2,7 +2,9 @@ PACKAGE=runtime CONFS= minfree -CONFSDIR= /var/crash +VAR_CRASH= /var/crash +VAR_CRASH_MODE= 0750 +CONFSDIR= VAR_CRASH PROG= savecore LIBADD= z xo MAN= savecore.8 Modified: releng/12.0/sys/amd64/amd64/machdep.c ============================================================================== --- releng/12.0/sys/amd64/amd64/machdep.c Wed Dec 5 18:26:40 2018 (r341602) +++ releng/12.0/sys/amd64/amd64/machdep.c Wed Dec 5 19:16:12 2018 (r341603) @@ -2043,6 +2043,7 @@ fill_regs(struct thread *td, struct reg *regs) int fill_frame_regs(struct trapframe *tp, struct reg *regs) { + regs->r_r15 = tp->tf_r15; regs->r_r14 = tp->tf_r14; regs->r_r13 = tp->tf_r13; @@ -2074,6 +2075,8 @@ fill_frame_regs(struct trapframe *tp, struct reg *regs regs->r_fs = 0; regs->r_gs = 0; } + regs->r_err = 0; + regs->r_trapno = 0; return (0); } Modified: releng/12.0/sys/amd64/ia32/ia32_reg.c ============================================================================== --- releng/12.0/sys/amd64/ia32/ia32_reg.c Wed Dec 5 18:26:40 2018 (r341602) +++ releng/12.0/sys/amd64/ia32/ia32_reg.c Wed Dec 5 19:16:12 2018 (r341603) @@ -105,6 +105,8 @@ fill_regs32(struct thread *td, struct reg32 *regs) regs->r_eflags = tp->tf_rflags; regs->r_esp = tp->tf_rsp; regs->r_ss = tp->tf_ss; + regs->r_err = 0; + regs->r_trapno = 0; return (0); } Modified: releng/12.0/sys/arm/arm/machdep_kdb.c ============================================================================== --- releng/12.0/sys/arm/arm/machdep_kdb.c Wed Dec 5 18:26:40 2018 (r341602) +++ releng/12.0/sys/arm/arm/machdep_kdb.c Wed Dec 5 19:16:12 2018 (r341603) @@ -104,6 +104,7 @@ fill_regs(struct thread *td, struct reg *regs) regs->r_cpsr = tf->tf_spsr; return (0); } + int fill_fpregs(struct thread *td, struct fpreg *regs) { @@ -134,8 +135,11 @@ set_fpregs(struct thread *td, struct fpreg *regs) int fill_dbregs(struct thread *td, struct dbreg *regs) { + + bzero(regs, sizeof(*regs)); return (0); } + int set_dbregs(struct thread *td, struct dbreg *regs) { Modified: releng/12.0/sys/fs/procfs/procfs_dbregs.c ============================================================================== --- releng/12.0/sys/fs/procfs/procfs_dbregs.c Wed Dec 5 18:26:40 2018 (r341602) +++ releng/12.0/sys/fs/procfs/procfs_dbregs.c Wed Dec 5 19:16:12 2018 (r341603) @@ -112,8 +112,10 @@ procfs_doprocdbregs(PFS_FILL_ARGS) return (EINVAL); } wrap32 = 1; - } + memset(&r32, 0, sizeof(r32)); + } else #endif + memset(&r, 0, sizeof(r)); error = PROC(read, dbregs, td2, &r); if (error == 0) { PROC_UNLOCK(p); Modified: releng/12.0/sys/fs/procfs/procfs_fpregs.c ============================================================================== --- releng/12.0/sys/fs/procfs/procfs_fpregs.c Wed Dec 5 18:26:40 2018 (r341602) +++ releng/12.0/sys/fs/procfs/procfs_fpregs.c Wed Dec 5 19:16:12 2018 (r341603) @@ -102,7 +102,6 @@ procfs_doprocfpregs(PFS_FILL_ARGS) return (EBUSY); } - /* XXXKSE: */ td2 = FIRST_THREAD_IN_PROC(p); #ifdef COMPAT_FREEBSD32 if (SV_CURPROC_FLAG(SV_ILP32)) { @@ -111,8 +110,10 @@ procfs_doprocfpregs(PFS_FILL_ARGS) return (EINVAL); } wrap32 = 1; - } + memset(&r32, 0, sizeof(r32)); + } else #endif + memset(&r, 0, sizeof(r)); error = PROC(read, fpregs, td2, &r); if (error == 0) { PROC_UNLOCK(p); Modified: releng/12.0/sys/fs/procfs/procfs_regs.c ============================================================================== --- releng/12.0/sys/fs/procfs/procfs_regs.c Wed Dec 5 18:26:40 2018 (r341602) +++ releng/12.0/sys/fs/procfs/procfs_regs.c Wed Dec 5 19:16:12 2018 (r341603) @@ -102,7 +102,6 @@ procfs_doprocregs(PFS_FILL_ARGS) return (EBUSY); } - /* XXXKSE: */ td2 = FIRST_THREAD_IN_PROC(p); #ifdef COMPAT_FREEBSD32 if (SV_CURPROC_FLAG(SV_ILP32)) { @@ -111,8 +110,10 @@ procfs_doprocregs(PFS_FILL_ARGS) return (EINVAL); } wrap32 = 1; - } + memset(&r32, 0, sizeof(r32)); + } else #endif + memset(&r, 0, sizeof(r)); error = PROC(read, regs, td2, &r); if (error == 0) { PROC_UNLOCK(p); Modified: releng/12.0/sys/i386/i386/machdep.c ============================================================================== --- releng/12.0/sys/i386/i386/machdep.c Wed Dec 5 18:26:40 2018 (r341602) +++ releng/12.0/sys/i386/i386/machdep.c Wed Dec 5 19:16:12 2018 (r341603) @@ -2817,6 +2817,7 @@ fill_regs(struct thread *td, struct reg *regs) int fill_frame_regs(struct trapframe *tp, struct reg *regs) { + regs->r_fs = tp->tf_fs; regs->r_es = tp->tf_es; regs->r_ds = tp->tf_ds; @@ -2832,6 +2833,8 @@ fill_frame_regs(struct trapframe *tp, struct reg *regs regs->r_eflags = tp->tf_eflags; regs->r_esp = tp->tf_esp; regs->r_ss = tp->tf_ss; + regs->r_err = 0; + regs->r_trapno = 0; return (0); } Modified: releng/12.0/sys/kern/sys_process.c ============================================================================== --- releng/12.0/sys/kern/sys_process.c Wed Dec 5 18:26:40 2018 (r341602) +++ releng/12.0/sys/kern/sys_process.c Wed Dec 5 19:16:12 2018 (r341603) @@ -540,6 +540,9 @@ struct ptrace_args { * copyin(uap->addr, &r.reg32, sizeof r.reg32); * .. except this is done at runtime. */ +#define BZERO(a, s) wrap32 ? \ + bzero(a ## 32, s ## 32) : \ + bzero(a, s) #define COPYIN(u, k, s) wrap32 ? \ copyin(u, k ## 32, s ## 32) : \ copyin(u, k, s) @@ -547,6 +550,7 @@ struct ptrace_args { copyout(k ## 32, u, s ## 32) : \ copyout(k, u, s) #else +#define BZERO(a, s) bzero(a, s) #define COPYIN(u, k, s) copyin(u, k, s) #define COPYOUT(k, u, s) copyout(k, u, s) #endif @@ -572,7 +576,7 @@ sys_ptrace(struct thread *td, struct ptrace_args *uap) struct ptrace_lwpinfo32 pl32; struct ptrace_vm_entry32 pve32; #endif - char args[nitems(td->td_sa.args) * sizeof(register_t)]; + char args[sizeof(td->td_sa.args)]; int ptevents; } r; void *addr; @@ -589,11 +593,17 @@ sys_ptrace(struct thread *td, struct ptrace_args *uap) addr = &r; switch (uap->req) { case PT_GET_EVENT_MASK: + case PT_LWPINFO: + case PT_GET_SC_ARGS: + break; case PT_GETREGS: + BZERO(&r.reg, sizeof r.reg); + break; case PT_GETFPREGS: + BZERO(&r.fpreg, sizeof r.fpreg); + break; case PT_GETDBREGS: - case PT_LWPINFO: - case PT_GET_SC_ARGS: + BZERO(&r.dbreg, sizeof r.dbreg); break; case PT_SETREGS: error = COPYIN(uap->addr, &r.reg, sizeof r.reg); @@ -661,6 +671,7 @@ sys_ptrace(struct thread *td, struct ptrace_args *uap) } #undef COPYIN #undef COPYOUT +#undef BZERO #ifdef COMPAT_FREEBSD32 /* Modified: releng/12.0/sys/sparc64/sparc64/machdep.c ============================================================================== --- releng/12.0/sys/sparc64/sparc64/machdep.c Wed Dec 5 18:26:40 2018 (r341602) +++ releng/12.0/sys/sparc64/sparc64/machdep.c Wed Dec 5 19:16:12 2018 (r341603) @@ -1056,6 +1056,7 @@ fill_fpregs(struct thread *td, struct fpreg *fpregs) bcopy(pcb->pcb_ufp, fpregs->fr_regs, sizeof(fpregs->fr_regs)); fpregs->fr_fsr = tf->tf_fsr; fpregs->fr_gsr = tf->tf_gsr; + fpregs->fr_pad[0] = 0; return (0); } From owner-svn-src-releng@freebsd.org Thu Dec 6 06:19:12 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 736301313E3D for ; Thu, 6 Dec 2018 06:19:12 +0000 (UTC) (envelope-from bounce+c4e04e.b1b642-svn-src-releng=freebsd.org@home.dimapanov.com) Received: from mail2.static.mailgun.info (mail2.static.mailgun.info [104.130.122.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EF6F5807B5 for ; Thu, 6 Dec 2018 06:19:11 +0000 (UTC) (envelope-from bounce+c4e04e.b1b642-svn-src-releng=freebsd.org@home.dimapanov.com) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=home.dimapanov.com; q=dns/txt; s=smtp; t=1544077151; h=Content-Transfer-Encoding: Content-Type: In-Reply-To: MIME-Version: Date: Message-ID: From: References: Cc: To: Subject: Reply-To: Sender; bh=+G04V5T6nko9O/GU676q4Gpbl5S0jkG3f2q1T5InomY=; b=KuAUnwzpFMi17T85JuXyVBzoW63hxi+lmG4oUqmlQ2nBqJy16qOaF+KAoOsAZR5A73HwtNQE fLc4XFbgpjBsePAuJCcK28Q9voBambHMyx36NfwTxpnelFUA6xC8Nxob2U8yrZG4jQM97JW2 aANOBhLgNfPaI2iHVHxuK0VuLH0= X-Mailgun-Sending-Ip: 104.130.122.2 X-Mailgun-Sid: WyIwYTU2NSIsICJzdm4tc3JjLXJlbGVuZ0BmcmVlYnNkLm9yZyIsICJiMWI2NDIiXQ== Sender: fluffy=freebsd.org@home.dimapanov.com Received: from iMac-Fluffy.local (Unknown [172.111.245.169]) by mxa.mailgun.org with ESMTP id 5c08ba9c.7f6c6edf23e8-smtp-out-n01; Thu, 06 Dec 2018 05:58:52 -0000 (UTC) Reply-To: fluffy@FreeBSD.org Subject: Re: svn commit: r341266 - in releng/12.0: . sys/modules/iavf To: Marius Strobl Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org References: <201811292159.wATLx9Bb099604@repo.freebsd.org> From: Dima Panov Message-ID: <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> Date: Thu, 6 Dec 2018 15:58:44 +1000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 PostboxApp/6.1.6 MIME-Version: 1.0 In-Reply-To: <201811292159.wATLx9Bb099604@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: ru Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: EF6F5807B5 X-Spamd-Result: default: False [-0.41 / 15.00]; HAS_REPLYTO(0.00)[fluffy@FreeBSD.org]; MX_INVALID(0.50)[cached]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:104.130.122.0/23]; REPLYTO_ADDR_EQ_FROM(0.00)[]; DKIM_TRACE(0.00)[home.dimapanov.com:+]; NEURAL_HAM_SHORT(-0.60)[-0.604,0]; FORGED_SENDER(0.30)[fluffy@FreeBSD.org,bounce@home.dimapanov.com]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.61)[ipnet: 104.130.120.0/22(0.48), asn: 27357(-3.46), country: US(-0.09)]; ASN(0.00)[asn:27357, ipnet:104.130.120.0/22, country:US]; FROM_NEQ_ENVFROM(0.00)[fluffy@FreeBSD.org,bounce@home.dimapanov.com]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; R_DKIM_ALLOW(-0.20)[home.dimapanov.com]; TAGGED_FROM(0.00)[c4e04e.b1b642-svn-src-releng=freebsd.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-0.997,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2.122.130.104.list.dnswl.org : 127.0.15.0]; FORGED_MUA_MOZILLA_MAIL_MSGID_UNKNOWN(2.50)[]; RCVD_COUNT_TWO(0.00)[2] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 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, 06 Dec 2018 06:19:12 -0000 Hello! Marius Strobl wrote on 30/11/2018 07:59: > Author: marius > Date: Thu Nov 29 21:59:09 2018 > New Revision: 341266 > URL: https://svnweb.freebsd.org/changeset/base/341266 > > Log: > MFC: r341016, MF12: r341261 > > - Add a belated UPDATING entry for the ixlv(4) -> iavf(4) rename in r339338. > - Likewise, add ixlv.4.gz to OLD_FILES, > - and link if_ixlv.ko to if_iavf.ko in order to aid a bit in the transition. > [cut] > > Modified: releng/12.0/sys/modules/iavf/Makefile > ============================================================================== > --- releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:20:53 2018 (r341265) > +++ releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:59:09 2018 (r341266) > @@ -15,4 +15,6 @@ SRCS += i40e_common.c i40e_nvm.c i40e_adminq.c > # Enable asserts and other debugging facilities > # CFLAGS += -DINVARIANTS -DINVARIANTS_SUPPORT -DWITNESS > > +LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_ixlv.ko > + > .include And this broke poudriere jail upgrade due to missed kernel modules for build purpose # poudriere jail -u -j fbsd12-test -t 12.0-RC3 [skip] /usr/src/usr.sbin/newsyslog/newsyslog.c To install the downloaded upgrades, run "/usr/sbin/freebsd-update.fixed install". Installing updates...ln: ///boot/kernel/if_iavf.ko: No such file or directory chflags: ///boot/kernel/if_ixlv.ko: No such file or directory [00:20:27] Error: Fail to upgrade system # -- Dima Panov (fluffy@FreeBSD.org) (X11, KDE, Office)@FreeBSD team Facebook: http://www.facebook.com/fluffy.khv twitter: fluffy_khv | skype: dima.panov | telegram: @dima_panov IRC: fluffy@EFNet, fluffykhv@FreeNode From owner-svn-src-releng@freebsd.org Thu Dec 6 17:25:16 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FBAB130C44E; Thu, 6 Dec 2018 17:25:16 +0000 (UTC) (envelope-from marius@alchemy.franken.de) Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "alchemy.franken.de", Issuer "alchemy.franken.de" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 8806A76711; Thu, 6 Dec 2018 17:25:14 +0000 (UTC) (envelope-from marius@alchemy.franken.de) Received: from alchemy.franken.de (localhost [127.0.0.1]) by alchemy.franken.de (8.15.2/8.15.2/ALCHEMY.FRANKEN.DE) with ESMTPS id wB6HP64t015300 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 6 Dec 2018 18:25:06 +0100 (CET) (envelope-from marius@alchemy.franken.de) Received: (from marius@localhost) by alchemy.franken.de (8.15.2/8.15.2/Submit) id wB6HP6KH015299; Thu, 6 Dec 2018 18:25:06 +0100 (CET) (envelope-from marius) Date: Thu, 6 Dec 2018 18:25:06 +0100 From: Marius Strobl To: Dima Panov Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: Re: svn commit: r341266 - in releng/12.0: . sys/modules/iavf Message-ID: <20181206172506.GU93591@alchemy.franken.de> References: <201811292159.wATLx9Bb099604@repo.freebsd.org> <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> User-Agent: Mutt/1.9.2 (2017-12-15) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (alchemy.franken.de [0.0.0.0]); Thu, 06 Dec 2018 18:25:06 +0100 (CET) X-Rspamd-Queue-Id: 8806A76711 X-Spamd-Result: default: False [-4.57 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; IP_SCORE(-2.77)[ip: (-9.53), ipnet: 194.94.0.0/15(-4.18), asn: 680(-0.11), country: DE(-0.01)]; MX_GOOD(-0.01)[alchemy.franken.de,hub-r.franken.de,rachael.franken.de]; NEURAL_HAM_SHORT(-1.00)[-0.996,0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[marius@freebsd.org,marius@alchemy.franken.de]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:680, ipnet:194.94.0.0/15, country:DE]; FROM_NEQ_ENVFROM(0.00)[marius@freebsd.org,marius@alchemy.franken.de] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 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, 06 Dec 2018 17:25:16 -0000 On Thu, Dec 06, 2018 at 03:58:44PM +1000, Dima Panov wrote: > Hello! > > Marius Strobl wrote on 30/11/2018 07:59: > > Author: marius > > Date: Thu Nov 29 21:59:09 2018 > > New Revision: 341266 > > URL: https://svnweb.freebsd.org/changeset/base/341266 > > > > Log: > > MFC: r341016, MF12: r341261 > > > > - Add a belated UPDATING entry for the ixlv(4) -> iavf(4) rename in r339338. > > - Likewise, add ixlv.4.gz to OLD_FILES, > > - and link if_ixlv.ko to if_iavf.ko in order to aid a bit in the transition. > > > [cut] > > > > Modified: releng/12.0/sys/modules/iavf/Makefile > > ============================================================================== > > --- releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:20:53 2018 (r341265) > > +++ releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:59:09 2018 (r341266) > > @@ -15,4 +15,6 @@ SRCS += i40e_common.c i40e_nvm.c i40e_adminq.c > > # Enable asserts and other debugging facilities > > # CFLAGS += -DINVARIANTS -DINVARIANTS_SUPPORT -DWITNESS > > > > +LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_ixlv.ko > > + > > .include > > > And this broke poudriere jail upgrade due to missed kernel modules for > build purpose > > # poudriere jail -u -j fbsd12-test -t 12.0-RC3 > [skip] > /usr/src/usr.sbin/newsyslog/newsyslog.c > To install the downloaded upgrades, run "/usr/sbin/freebsd-update.fixed > install". > Installing updates...ln: ///boot/kernel/if_iavf.ko: No such file or > directory > chflags: ///boot/kernel/if_ixlv.ko: No such file or directory > [00:20:27] Error: Fail to upgrade system > # Hrm, apparently this doesn't trip up with a native, i. e. non-poudriere, environment and I'd assume that the linking of if_igb.ko to if_em.ko that sys/modules/em/Makefile does ever since r324500 isn't causing problems with poudriere either. What are poudriere and the "fixed" version of freebsd-update(8) doing differently than native counterparts and what do you mean by "missed kernel modules for build purpose"? Marius From owner-svn-src-releng@freebsd.org Thu Dec 6 17:30:07 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA51D130C572; Thu, 6 Dec 2018 17:30:06 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 80A9276A36; Thu, 6 Dec 2018 17:30:06 +0000 (UTC) (envelope-from gjb@freebsd.org) Received: from FreeBSD.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id F034EF321; Thu, 6 Dec 2018 17:30:05 +0000 (UTC) (envelope-from gjb@freebsd.org) Date: Thu, 6 Dec 2018 17:30:03 +0000 From: Glen Barber To: Marius Strobl Cc: Dima Panov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: Re: svn commit: r341266 - in releng/12.0: . sys/modules/iavf Message-ID: <20181206173003.GE29692@FreeBSD.org> References: <201811292159.wATLx9Bb099604@repo.freebsd.org> <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> <20181206172506.GU93591@alchemy.franken.de> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="n+lFg1Zro7sl44OB" Content-Disposition: inline In-Reply-To: <20181206172506.GU93591@alchemy.franken.de> User-Agent: Mutt/1.10.1 (2018-07-13) X-Rspamd-Queue-Id: 80A9276A36 X-Spamd-Result: default: False [-2.50 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.94)[-0.936,0]; NEURAL_HAM_LONG(-0.61)[-0.609,0]; NEURAL_HAM_SHORT(-0.96)[-0.957,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 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, 06 Dec 2018 17:30:07 -0000 --n+lFg1Zro7sl44OB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Dec 06, 2018 at 06:25:06PM +0100, Marius Strobl wrote: > On Thu, Dec 06, 2018 at 03:58:44PM +1000, Dima Panov wrote: > > Hello! > >=20 > > Marius Strobl wrote on 30/11/2018 07:59: > > > Author: marius > > > Date: Thu Nov 29 21:59:09 2018 > > > New Revision: 341266 > > > URL: https://svnweb.freebsd.org/changeset/base/341266 > > >=20 > > > Log: > > > MFC: r341016, MF12: r341261 > > > =20 > > > - Add a belated UPDATING entry for the ixlv(4) -> iavf(4) rename i= n r339338. > > > - Likewise, add ixlv.4.gz to OLD_FILES, > > > - and link if_ixlv.ko to if_iavf.ko in order to aid a bit in the t= ransition. > > > =20 > > [cut] > > >=20 > > > Modified: releng/12.0/sys/modules/iavf/Makefile > > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > > --- releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:20:53 2018 (r= 341265) > > > +++ releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:59:09 2018 (r= 341266) > > > @@ -15,4 +15,6 @@ SRCS +=3D i40e_common.c i40e_nvm.c i40e_adminq.c > > > # Enable asserts and other debugging facilities > > > # CFLAGS +=3D -DINVARIANTS -DINVARIANTS_SUPPORT -DWITNESS > > > =20 > > > +LINKS=3D ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_ixlv.ko > > > + > > > .include > >=20 > >=20 > > And this broke poudriere jail upgrade due to missed kernel modules for= =20 > > build purpose > >=20 > > # poudriere jail -u -j fbsd12-test -t 12.0-RC3 > > [skip] > > /usr/src/usr.sbin/newsyslog/newsyslog.c > > To install the downloaded upgrades, run "/usr/sbin/freebsd-update.fixed= =20 > > install". > > Installing updates...ln: ///boot/kernel/if_iavf.ko: No such file or=20 > > directory > > chflags: ///boot/kernel/if_ixlv.ko: No such file or directory > > [00:20:27] Error: Fail to upgrade system > > # >=20 > Hrm, apparently this doesn't trip up with a native, i. e. non-poudriere, > environment and I'd assume that the linking of if_igb.ko to if_em.ko that > sys/modules/em/Makefile does ever since r324500 isn't causing problems > with poudriere either. What are poudriere and the "fixed" version of > freebsd-update(8) doing differently than native counterparts and what do > you mean by "missed kernel modules for build purpose"? >=20 FWIW, I did not see this in all of my freebsd-update(8) tests. Glen --n+lFg1Zro7sl44OB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAlwJXJsACgkQAxRYpUeP 4pOYdg//aDdoyYeJgzdnB26Oqmi39lSvSxq1bYWYaWpcFGA1zHJ/VtG0We4eW90s 7pZQVHpJAzk3Ym9jF89OIAB4UaxroYUP/uFRBSaOVg6/qKRb5IdJjVXMbQxFfa5y Tm4fmbevn8cA7o30o7GucbaiYwNkjTOv2vEkQ9O3RrqGAu7cKTxxdScA+eRH+sU7 XKqrbLs6g98uyOe24qWDANyJpWYMWutyGhaoiGnk19VacLUublBsJ9Yu6BwT1I7E FFk9ARPF01+nYLZO4q/MQdMJ7xGYJCyhEPUYqsX3LK0fnp2yirivEsnXyspHhcv/ +5V2FJebhlI9NPqxHwOgM31SipzI8SZKyeZpjK4Uv/Z89Ow3pbUM5tgaCaK4fqxh BTP//r39ZevLdn0Qlt1IClLjk9SjU4Y8RiXNzyNIvCRce7b5YYOBIh3LrvQBKBxM CzZMO10hANCoOa0H1La6GvFINQoLld3X8tWK2HYVRodfLzh/KqZSOsJ2HPvJID6T 2oJ1KrSg0xGz/rlDvNPb35OBxZlceanFZwePQxuhdCflO68Bv2OKzBVNi+1r+Bns pChrECYNHHG3vz2ur8HC3g9AyHW9/bYyYTxfwluIWkTua7nRYNQNtpbKCBgOA30T tAyWsMeQAr+bSTp5RZm92FPEVg7rcpWSqWaF5wajXnW7y0REVYg= =9DJV -----END PGP SIGNATURE----- --n+lFg1Zro7sl44OB-- From owner-svn-src-releng@freebsd.org Thu Dec 6 18:39:50 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F1620130E89A for ; Thu, 6 Dec 2018 18:39:49 +0000 (UTC) (envelope-from bounce+c4e04e.b1b642-svn-src-releng=freebsd.org@home.dimapanov.com) Received: from mail2.static.mailgun.info (mail2.static.mailgun.info [104.130.122.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 669B379D7B for ; Thu, 6 Dec 2018 18:39:38 +0000 (UTC) (envelope-from bounce+c4e04e.b1b642-svn-src-releng=freebsd.org@home.dimapanov.com) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=home.dimapanov.com; q=dns/txt; s=smtp; t=1544121578; h=Content-Transfer-Encoding: Content-Type: In-Reply-To: MIME-Version: Date: Message-ID: From: References: Cc: To: Subject: Reply-To: Sender; bh=ujF98rQczjE375DTHm02+Mw2fYYUyFrQzEO02IsMr4s=; b=TaPKk2RiP6KOBd9GX4bIZwnQBvR8k6BDUVMQSP9usuyWq/VrPE+YZ5Hc75f9jG4by29urEEu Jp9HnDOdJWQt5ESNL2dLuOwydM7MZmieOzLpPsrxY/nOYhXgrEj0dWfmCzLpH1bkYoBGZ6vC AAv7pH73zkL1vA2+N6oA+mN7DjI= X-Mailgun-Sending-Ip: 104.130.122.2 X-Mailgun-Sid: WyIwYTU2NSIsICJzdm4tc3JjLXJlbGVuZ0BmcmVlYnNkLm9yZyIsICJiMWI2NDIiXQ== Sender: fluffy=freebsd.org@home.dimapanov.com Received: from iMac-Fluffy.local (Unknown [172.111.245.169]) by mxa.mailgun.org with ESMTP id 5c096cea.7fc010d590a0-smtp-out-n03; Thu, 06 Dec 2018 18:39:38 -0000 (UTC) Reply-To: fluffy@FreeBSD.org Subject: Re: svn commit: r341266 - in releng/12.0: . sys/modules/iavf To: Marius Strobl Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org References: <201811292159.wATLx9Bb099604@repo.freebsd.org> <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> <20181206172506.GU93591@alchemy.franken.de> From: Dima Panov Message-ID: <8cdcbd76-64c0-4bb5-e37c-2102d5a70a7c@FreeBSD.org> Date: Fri, 7 Dec 2018 04:39:33 +1000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 PostboxApp/6.1.6 MIME-Version: 1.0 In-Reply-To: <20181206172506.GU93591@alchemy.franken.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: ru Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 669B379D7B X-Spamd-Result: default: False [3.47 / 15.00]; HAS_REPLYTO(0.00)[fluffy@FreeBSD.org]; MX_INVALID(0.50)[greylisted]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:104.130.122.0/23]; REPLYTO_ADDR_EQ_FROM(0.00)[]; DKIM_TRACE(0.00)[home.dimapanov.com:+]; NEURAL_HAM_SHORT(-0.75)[-0.754,0]; FORGED_SENDER(0.30)[fluffy@FreeBSD.org,bounce@home.dimapanov.com]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.59)[ipnet: 104.130.120.0/22(0.56), asn: 27357(-3.41), country: US(-0.09)]; ASN(0.00)[asn:27357, ipnet:104.130.120.0/22, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[c4e04e.b1b642-svn-src-releng=freebsd.org]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.86)[-0.856,0]; R_DKIM_ALLOW(-0.20)[home.dimapanov.com]; FROM_NEQ_ENVFROM(0.00)[fluffy@FreeBSD.org,bounce@home.dimapanov.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-0.63)[-0.633,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_MISSING(3.50)[requested record is not found]; RCVD_IN_DNSWL_NONE(0.00)[2.122.130.104.list.dnswl.org : 127.0.15.0]; FORGED_MUA_MOZILLA_MAIL_MSGID_UNKNOWN(2.50)[]; RCVD_COUNT_TWO(0.00)[2]; GREYLIST(0.00)[pass,meta] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 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, 06 Dec 2018 18:39:50 -0000 Hello! Marius Strobl wrote on 07/12/2018 03:25: > On Thu, Dec 06, 2018 at 03:58:44PM +1000, Dima Panov wrote: >> Hello! >> >> Marius Strobl wrote on 30/11/2018 07:59: >>> Author: marius >>> Date: Thu Nov 29 21:59:09 2018 >>> New Revision: 341266 >>> URL: https://svnweb.freebsd.org/changeset/base/341266 >>> >>> Log: >>> MFC: r341016, MF12: r341261 >>> >>> - Add a belated UPDATING entry for the ixlv(4) -> iavf(4) rename in r339338. >>> - Likewise, add ixlv.4.gz to OLD_FILES, >>> - and link if_ixlv.ko to if_iavf.ko in order to aid a bit in the transition. >>> >> [cut] >>> >>> Modified: releng/12.0/sys/modules/iavf/Makefile >>> ============================================================================== >>> --- releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:20:53 2018 (r341265) >>> +++ releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:59:09 2018 (r341266) >>> @@ -15,4 +15,6 @@ SRCS += i40e_common.c i40e_nvm.c i40e_adminq.c >>> # Enable asserts and other debugging facilities >>> # CFLAGS += -DINVARIANTS -DINVARIANTS_SUPPORT -DWITNESS >>> >>> +LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_ixlv.ko >>> + >>> .include >> >> >> And this broke poudriere jail upgrade due to missed kernel modules for >> build purpose >> >> # poudriere jail -u -j fbsd12-test -t 12.0-RC3 >> [skip] >> /usr/src/usr.sbin/newsyslog/newsyslog.c >> To install the downloaded upgrades, run "/usr/sbin/freebsd-update.fixed >> install". >> Installing updates...ln: ///boot/kernel/if_iavf.ko: No such file or >> directory >> chflags: ///boot/kernel/if_ixlv.ko: No such file or directory >> [00:20:27] Error: Fail to upgrade system >> # > > Hrm, apparently this doesn't trip up with a native, i. e. non-poudriere, > environment and I'd assume that the linking of if_igb.ko to if_em.ko that > sys/modules/em/Makefile does ever since r324500 isn't causing problems > with poudriere either. What are poudriere and the "fixed" version of > freebsd-update(8) doing differently than native counterparts and what do > you mean by "missed kernel modules for build purpose"? > Poudriere not install kernel/modules package into jails, only base|lib|src, so whole '${jail}/boot/kernel' directory is missing, but freebsd-update(8) unconditionaly try to link on modules. Package building procedure is not demanding on binary kernel and modules -- Dima Panov (fluffy@FreeBSD.org) (X11, KDE, Office)@FreeBSD team Facebook: http://www.facebook.com/fluffy.khv twitter: fluffy_khv | skype: dima.panov | telegram: @dima_panov IRC: fluffy@EFNet, fluffykhv@FreeNode From owner-svn-src-releng@freebsd.org Thu Dec 6 19:08:04 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6D40130F874; Thu, 6 Dec 2018 19:08:04 +0000 (UTC) (envelope-from marius@alchemy.franken.de) Received: from alchemy.franken.de (alchemy.franken.de [194.94.249.214]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "alchemy.franken.de", Issuer "alchemy.franken.de" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id D447F7B224; Thu, 6 Dec 2018 19:08:03 +0000 (UTC) (envelope-from marius@alchemy.franken.de) Received: from alchemy.franken.de (localhost [127.0.0.1]) by alchemy.franken.de (8.15.2/8.15.2/ALCHEMY.FRANKEN.DE) with ESMTPS id wB6J82TJ016239 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 6 Dec 2018 20:08:02 +0100 (CET) (envelope-from marius@alchemy.franken.de) Received: (from marius@localhost) by alchemy.franken.de (8.15.2/8.15.2/Submit) id wB6J82MY016238; Thu, 6 Dec 2018 20:08:02 +0100 (CET) (envelope-from marius) Date: Thu, 6 Dec 2018 20:08:02 +0100 From: Marius Strobl To: Glen Barber Cc: Dima Panov , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: Re: svn commit: r341266 - in releng/12.0: . sys/modules/iavf Message-ID: <20181206190802.GV93591@alchemy.franken.de> References: <201811292159.wATLx9Bb099604@repo.freebsd.org> <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> <20181206172506.GU93591@alchemy.franken.de> <20181206173003.GE29692@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181206173003.GE29692@FreeBSD.org> User-Agent: Mutt/1.9.2 (2017-12-15) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (alchemy.franken.de [0.0.0.0]); Thu, 06 Dec 2018 20:08:02 +0100 (CET) X-Rspamd-Queue-Id: D447F7B224 X-Spamd-Result: default: False [-4.50 / 15.00]; TO_DN_SOME(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; RCVD_COUNT_THREE(0.00)[3]; MX_GOOD(-0.01)[cached: alchemy.franken.de]; NEURAL_HAM_SHORT(-0.98)[-0.985,0]; FORGED_SENDER(0.30)[marius@freebsd.org,marius@alchemy.franken.de]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:680, ipnet:194.94.0.0/15, country:DE]; FROM_NEQ_ENVFROM(0.00)[marius@freebsd.org,marius@alchemy.franken.de]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org]; AUTH_NA(1.00)[]; IP_SCORE(-2.71)[ip: (-9.35), ipnet: 194.94.0.0/15(-4.08), asn: 680(-0.11), country: DE(-0.01)]; R_SPF_NA(0.00)[] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 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, 06 Dec 2018 19:08:05 -0000 On Thu, Dec 06, 2018 at 05:30:03PM +0000, Glen Barber wrote: > On Thu, Dec 06, 2018 at 06:25:06PM +0100, Marius Strobl wrote: > > On Thu, Dec 06, 2018 at 03:58:44PM +1000, Dima Panov wrote: > > > Hello! > > > > > > Marius Strobl wrote on 30/11/2018 07:59: > > > > Author: marius > > > > Date: Thu Nov 29 21:59:09 2018 > > > > New Revision: 341266 > > > > URL: https://svnweb.freebsd.org/changeset/base/341266 > > > > > > > > Log: > > > > MFC: r341016, MF12: r341261 > > > > > > > > - Add a belated UPDATING entry for the ixlv(4) -> iavf(4) rename in r339338. > > > > - Likewise, add ixlv.4.gz to OLD_FILES, > > > > - and link if_ixlv.ko to if_iavf.ko in order to aid a bit in the transition. > > > > > > > [cut] > > > > > > > > Modified: releng/12.0/sys/modules/iavf/Makefile > > > > ============================================================================== > > > > --- releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:20:53 2018 (r341265) > > > > +++ releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:59:09 2018 (r341266) > > > > @@ -15,4 +15,6 @@ SRCS += i40e_common.c i40e_nvm.c i40e_adminq.c > > > > # Enable asserts and other debugging facilities > > > > # CFLAGS += -DINVARIANTS -DINVARIANTS_SUPPORT -DWITNESS > > > > > > > > +LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_ixlv.ko > > > > + > > > > .include > > > > > > > > > And this broke poudriere jail upgrade due to missed kernel modules for > > > build purpose > > > > > > # poudriere jail -u -j fbsd12-test -t 12.0-RC3 > > > [skip] > > > /usr/src/usr.sbin/newsyslog/newsyslog.c > > > To install the downloaded upgrades, run "/usr/sbin/freebsd-update.fixed > > > install". > > > Installing updates...ln: ///boot/kernel/if_iavf.ko: No such file or > > > directory > > > chflags: ///boot/kernel/if_ixlv.ko: No such file or directory > > > [00:20:27] Error: Fail to upgrade system > > > # > > > > Hrm, apparently this doesn't trip up with a native, i. e. non-poudriere, > > environment and I'd assume that the linking of if_igb.ko to if_em.ko that > > sys/modules/em/Makefile does ever since r324500 isn't causing problems > > with poudriere either. What are poudriere and the "fixed" version of > > freebsd-update(8) doing differently than native counterparts and what do > > you mean by "missed kernel modules for build purpose"? > > > > FWIW, I did not see this in all of my freebsd-update(8) tests. So could it be that a subset of the mirrors carries a corrupt index of 12.0-RC3? Otherwise I don't see how only some freebsd-update(8) runs to 12.0-RC3 fail or how the problem should be specific to if_ixlv.ko so far. Marius From owner-svn-src-releng@freebsd.org Fri Dec 7 00:00:14 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 291E2131BBAF; Fri, 7 Dec 2018 00:00:14 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id BCA5E6C76C; Fri, 7 Dec 2018 00:00: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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D7513008; Fri, 7 Dec 2018 00:00: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 wB700DXP057842; Fri, 7 Dec 2018 00:00:13 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB700D6Z057839; Fri, 7 Dec 2018 00:00:13 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201812070000.wB700D6Z057839@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 7 Dec 2018 00:00:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r341666 - in releng/12.0: . lib/csu/common sys/conf X-SVN-Group: releng X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in releng/12.0: . lib/csu/common sys/conf X-SVN-Commit-Revision: 341666 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: BCA5E6C76C X-Spamd-Result: default: False [-1.89 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.86)[-0.863,0]; NEURAL_HAM_SHORT(-0.95)[-0.948,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-0.08)[-0.083,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 07 Dec 2018 00:00:14 -0000 Author: gjb Date: Fri Dec 7 00:00:12 2018 New Revision: 341666 URL: https://svnweb.freebsd.org/changeset/base/341666 Log: - Switch releng/12.0 from RC3 to RELEASE. - Add the anticipated 12.0-RELEASE date to UPDATING. - Set a static __FreeBSD_version. - This one goes to 12. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/12.0/UPDATING releng/12.0/lib/csu/common/crtbrand.c releng/12.0/sys/conf/newvers.sh Modified: releng/12.0/UPDATING ============================================================================== --- releng/12.0/UPDATING Thu Dec 6 23:55:39 2018 (r341665) +++ releng/12.0/UPDATING Fri Dec 7 00:00:12 2018 (r341666) @@ -16,6 +16,9 @@ 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. +20181211: + 12.0-RELEASE. + 20181115: The set of CTM commands (ctm, ctm_smail, ctm_rmail, ctm_dequeue) has been converted to a port (misc/ctm) and will be removed from Modified: releng/12.0/lib/csu/common/crtbrand.c ============================================================================== --- releng/12.0/lib/csu/common/crtbrand.c Thu Dec 6 23:55:39 2018 (r341665) +++ releng/12.0/lib/csu/common/crtbrand.c Fri Dec 7 00:00:12 2018 (r341666) @@ -65,5 +65,5 @@ static const struct { .descsz = sizeof(int32_t), .type = NT_FREEBSD_ABI_TAG, .name = NOTE_FREEBSD_VENDOR, - .desc = __FreeBSD_version + .desc = 1200086 }; Modified: releng/12.0/sys/conf/newvers.sh ============================================================================== --- releng/12.0/sys/conf/newvers.sh Thu Dec 6 23:55:39 2018 (r341665) +++ releng/12.0/sys/conf/newvers.sh Fri Dec 7 00:00:12 2018 (r341666) @@ -46,7 +46,7 @@ TYPE="FreeBSD" REVISION="12.0" -BRANCH="RC3" +BRANCH="RELEASE" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@freebsd.org Fri Dec 7 03:30:15 2018 Return-Path: Delivered-To: svn-src-releng@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 15F2B132749B for ; Fri, 7 Dec 2018 03:30:15 +0000 (UTC) (envelope-from bounce+c4e04e.b1b642-svn-src-releng=freebsd.org@home.dimapanov.com) Received: from mail2.static.mailgun.info (mail2.static.mailgun.info [104.130.122.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 71FCB74398 for ; Fri, 7 Dec 2018 03:30:03 +0000 (UTC) (envelope-from bounce+c4e04e.b1b642-svn-src-releng=freebsd.org@home.dimapanov.com) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=home.dimapanov.com; q=dns/txt; s=smtp; t=1544153403; h=Content-Transfer-Encoding: Content-Type: In-Reply-To: MIME-Version: Date: Message-ID: From: References: Cc: To: Subject: Reply-To: Sender; bh=8eJ+9OmIpNqlo9FkIw1T/zMZVwhp0JYHewgr0DNPBfU=; b=cIIiWz24Ua030KO948jToURnswNIaRZcpBQGLDV8LTNOeza7U1ubGPPX/UIa+zBJu1bMy32K 9D1f87Lfa0Bf8latiCsw0sy6hopX5jfu4yoJxKtEnGuP5UYR7/EsmIIsobw7ZxtHUCJ3sNRe y2lNTd0PIdHDR2GMwyr7lr9qxBM= X-Mailgun-Sending-Ip: 104.130.122.2 X-Mailgun-Sid: WyIwYTU2NSIsICJzdm4tc3JjLXJlbGVuZ0BmcmVlYnNkLm9yZyIsICJiMWI2NDIiXQ== Sender: fluffy=freebsd.org@home.dimapanov.com Received: from iMac-Fluffy.local (Unknown [172.111.245.169]) by mxa.mailgun.org with ESMTP id 5c09e93a.7fc012af3378-smtp-out-n03; Fri, 07 Dec 2018 03:30:02 -0000 (UTC) Reply-To: fluffy@FreeBSD.org Subject: Re: svn commit: r341266 - in releng/12.0: . sys/modules/iavf To: Marius Strobl Cc: Glen Barber , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org References: <201811292159.wATLx9Bb099604@repo.freebsd.org> <31493546-f2a6-8ad4-5c6e-5e8d835debeb@FreeBSD.org> <20181206172506.GU93591@alchemy.franken.de> <20181206173003.GE29692@FreeBSD.org> <20181206190802.GV93591@alchemy.franken.de> From: Dima Panov Message-ID: Date: Fri, 7 Dec 2018 13:29:57 +1000 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.13; rv:52.0) Gecko/20100101 PostboxApp/6.1.6 MIME-Version: 1.0 In-Reply-To: <20181206190802.GV93591@alchemy.franken.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: ru Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 71FCB74398 X-Spamd-Result: default: False [3.96 / 15.00]; HAS_REPLYTO(0.00)[fluffy@FreeBSD.org]; MX_INVALID(0.50)[greylisted]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:104.130.122.0/23]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; DKIM_TRACE(0.00)[home.dimapanov.com:+]; NEURAL_HAM_SHORT(-0.65)[-0.649,0]; FORGED_SENDER(0.30)[fluffy@FreeBSD.org,bounce@home.dimapanov.com]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-0.57)[ipnet: 104.130.120.0/22(0.65), asn: 27357(-3.40), country: US(-0.09)]; ASN(0.00)[asn:27357, ipnet:104.130.120.0/22, country:US]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[c4e04e.b1b642-svn-src-releng=freebsd.org]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.52)[-0.525,0]; R_DKIM_ALLOW(-0.20)[home.dimapanov.com]; FROM_NEQ_ENVFROM(0.00)[fluffy@FreeBSD.org,bounce@home.dimapanov.com]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-0.60)[-0.601,0]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_MISSING(3.50)[requested record is not found]; RCVD_IN_DNSWL_NONE(0.00)[2.122.130.104.list.dnswl.org : 127.0.15.0]; FORGED_MUA_MOZILLA_MAIL_MSGID_UNKNOWN(2.50)[]; RCVD_COUNT_TWO(0.00)[2]; GREYLIST(0.00)[pass,meta] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 07 Dec 2018 03:30:15 -0000 Hello! Marius Strobl wrote on 07/12/2018 05:08: > On Thu, Dec 06, 2018 at 05:30:03PM +0000, Glen Barber wrote: >> On Thu, Dec 06, 2018 at 06:25:06PM +0100, Marius Strobl wrote: >>> On Thu, Dec 06, 2018 at 03:58:44PM +1000, Dima Panov wrote: >>>> Hello! >>>> >>>> Marius Strobl wrote on 30/11/2018 07:59: >>>>> Author: marius >>>>> Date: Thu Nov 29 21:59:09 2018 >>>>> New Revision: 341266 >>>>> URL: https://svnweb.freebsd.org/changeset/base/341266 >>>>> >>>>> Log: >>>>> MFC: r341016, MF12: r341261 >>>>> >>>>> - Add a belated UPDATING entry for the ixlv(4) -> iavf(4) rename in r339338. >>>>> - Likewise, add ixlv.4.gz to OLD_FILES, >>>>> - and link if_ixlv.ko to if_iavf.ko in order to aid a bit in the transition. >>>>> >>>> [cut] >>>>> >>>>> Modified: releng/12.0/sys/modules/iavf/Makefile >>>>> ============================================================================== >>>>> --- releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:20:53 2018 (r341265) >>>>> +++ releng/12.0/sys/modules/iavf/Makefile Thu Nov 29 21:59:09 2018 (r341266) >>>>> @@ -15,4 +15,6 @@ SRCS += i40e_common.c i40e_nvm.c i40e_adminq.c >>>>> # Enable asserts and other debugging facilities >>>>> # CFLAGS += -DINVARIANTS -DINVARIANTS_SUPPORT -DWITNESS >>>>> >>>>> +LINKS= ${KMODDIR}/${KMOD}.ko ${KMODDIR}/if_ixlv.ko >>>>> + >>>>> .include >>>> >>>> >>>> And this broke poudriere jail upgrade due to missed kernel modules for >>>> build purpose >>>> >>>> # poudriere jail -u -j fbsd12-test -t 12.0-RC3 >>>> [skip] >>>> /usr/src/usr.sbin/newsyslog/newsyslog.c >>>> To install the downloaded upgrades, run "/usr/sbin/freebsd-update.fixed >>>> install". >>>> Installing updates...ln: ///boot/kernel/if_iavf.ko: No such file or >>>> directory >>>> chflags: ///boot/kernel/if_ixlv.ko: No such file or directory >>>> [00:20:27] Error: Fail to upgrade system >>>> # >>> >>> Hrm, apparently this doesn't trip up with a native, i. e. non-poudriere, >>> environment and I'd assume that the linking of if_igb.ko to if_em.ko that >>> sys/modules/em/Makefile does ever since r324500 isn't causing problems >>> with poudriere either. What are poudriere and the "fixed" version of >>> freebsd-update(8) doing differently than native counterparts and what do >>> you mean by "missed kernel modules for build purpose"? >>> >> >> FWIW, I did not see this in all of my freebsd-update(8) tests. > > So could it be that a subset of the mirrors carries a corrupt index > of 12.0-RC3? Otherwise I don't see how only some freebsd-update(8) > runs to 12.0-RC3 fail or how the problem should be specific to > if_ixlv.ko so far. > No, mirrors are fine. Bug is repeatable on 4 different machines with poudrire during jails -RC2 => -RC3 binary upgrade. On a host installation upgrade is always fine — /bot/kernel/* is always present on live systems. Upgrade error caused by absent kernel and modules in poudriere jail installations. -- Dima Panov (fluffy@FreeBSD.org) (X11, KDE, Office)@FreeBSD team Facebook: http://www.facebook.com/fluffy.khv twitter: fluffy_khv | skype: dima.panov | telegram: @dima_panov IRC: fluffy@EFNet, fluffykhv@FreeNode