From owner-svn-src-all@freebsd.org Wed Aug 26 16:32:27 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 6D96F3B165B; Wed, 26 Aug 2020 16:32:27 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BcBGg2L8Kz4FjH; Wed, 26 Aug 2020 16:32:27 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id 343C6212DD; Wed, 26 Aug 2020 16:32:27 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qt1-f174.google.com with SMTP id c12so1844812qtn.9; Wed, 26 Aug 2020 09:32:27 -0700 (PDT) X-Gm-Message-State: AOAM531VDah+kGMm437OQFEJSLXnbpRYGMo4oLBAhjir9SdgvJjjEQgy X48aKBpQiioeINAdkOeHaShingQICUNQ0RbtCdY= X-Google-Smtp-Source: ABdhPJy56ZAOpVxBYbPq6oDBFpW1gJf2ey6iFUY6krpSJYl8uhIJQ8KQ1cEKGMMm5kw0XX6/CwMRL5UlfBvH+G4JpDM= X-Received: by 2002:ac8:70cd:: with SMTP id g13mr14968212qtp.53.1598459546769; Wed, 26 Aug 2020 09:32:26 -0700 (PDT) MIME-Version: 1.0 References: <202008260043.07Q0h0kH077834@repo.freebsd.org> <20200826115743.GA1791@kloomba> In-Reply-To: <20200826115743.GA1791@kloomba> From: Kyle Evans Date: Wed, 26 Aug 2020 11:32:14 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r364791 - head/usr.sbin/jail To: Roman Bogorodskiy Cc: Jamie Gritton , src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" 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:32:27 -0000 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/