Date: Wed, 26 Aug 2020 09:34:55 -0700 From: James Gritton <jamie@freebsd.org> To: Kyle Evans <kevans@freebsd.org> Cc: Roman Bogorodskiy <novel@freebsd.org>, src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r364791 - head/usr.sbin/jail Message-ID: <85c530bbdd61107631f305fa06b0dd48@freebsd.org> In-Reply-To: <CACNAnaGTZkdutzLy67F=YqAhUdGVoeKOWbS28jXbicepkeinEA@mail.gmail.com> References: <202008260043.07Q0h0kH077834@repo.freebsd.org> <20200826115743.GA1791@kloomba> <CACNAnaGTZkdutzLy67F=YqAhUdGVoeKOWbS28jXbicepkeinEA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2020-08-26 09:32, Kyle Evans wrote: > On Wed, Aug 26, 2020 at 6:58 AM Roman Bogorodskiy <novel@freebsd.org> > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?85c530bbdd61107631f305fa06b0dd48>