From owner-svn-src-all@freebsd.org Wed Aug 26 16:34:56 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 89CB13B1755; Wed, 26 Aug 2020 16:34:56 +0000 (UTC) (envelope-from jamie@freebsd.org) Received: from gritton.org (gritton.org [199.192.165.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4BcBKX2gj0z4FyC; Wed, 26 Aug 2020 16:34:56 +0000 (UTC) (envelope-from jamie@freebsd.org) Received: from gritton.org ([127.0.0.131]) (authenticated bits=0) by gritton.org (8.15.2/8.15.2) with ESMTPA id 07QGYtat018444; Wed, 26 Aug 2020 09:34:55 -0700 (PDT) (envelope-from jamie@freebsd.org) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Wed, 26 Aug 2020 09:34:55 -0700 From: James Gritton To: Kyle Evans Cc: Roman Bogorodskiy , src-committers , svn-src-all , svn-src-head Subject: Re: svn commit: r364791 - head/usr.sbin/jail In-Reply-To: References: <202008260043.07Q0h0kH077834@repo.freebsd.org> <20200826115743.GA1791@kloomba> User-Agent: Roundcube Webmail/1.4.1 Message-ID: <85c530bbdd61107631f305fa06b0dd48@freebsd.org> X-Sender: jamie@freebsd.org X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.6.2 (gritton.org [127.0.0.131]); Wed, 26 Aug 2020 10:34:55 -0600 (MDT) X-Rspamd-Queue-Id: 4BcBKX2gj0z4FyC X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:30247, ipnet:199.192.164.0/22, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Aug 2020 16:34:56 -0000 On 2020-08-26 09:32, Kyle Evans wrote: > On Wed, Aug 26, 2020 at 6:58 AM Roman Bogorodskiy > wrote: >> >> Jamie Gritton wrote: >> >> > Author: jamie >> > Date: Wed Aug 26 00:42:59 2020 >> > New Revision: 364791 >> > URL: https://svnweb.freebsd.org/changeset/base/364791 >> > >> > Log: >> > Handle jail.conf variables that have the same names as parameters. >> > >> > PR: 248444 >> > Submitted by: Akos Somfai >> > Reported by: Markus Stoff >> > >> > Modified: >> > head/usr.sbin/jail/config.c >> > >> > Modified: head/usr.sbin/jail/config.c >> > ============================================================================== >> > --- head/usr.sbin/jail/config.c Wed Aug 26 00:31:59 2020 (r364790) >> > +++ head/usr.sbin/jail/config.c Wed Aug 26 00:42:59 2020 (r364791) >> > @@ -393,7 +393,8 @@ add_param(struct cfjail *j, const struct cfparam *p, e >> > else >> > for (ipnum = IP__NULL + 1; ipnum < IP_NPARAM; ipnum++) >> > if (!(intparams[ipnum].flags & PF_CONV) && >> > - equalopts(name, intparams[ipnum].name)) { >> > + equalopts(name, intparams[ipnum].name) && >> > + !(p->flags & PF_VAR)) { >> > j->intparams[ipnum] = np; >> > np->flags |= intparams[ipnum].flags; >> > break; >> >> Looks like it's causing jail(8) to segfault, at least when using with >> poudriere: >> > > It looks like it's also wiped out a good chunk of the test suite, as > reported by lwhsu: > https://ci.freebsd.org/job/FreeBSD-head-amd64-test/16305/testReport/ Ooh - I killed things nicely, didn't I? I'll get on that. - Jamie