From owner-svn-src-all@freebsd.org Wed Aug 26 11:57: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 28ECA3D275F; Wed, 26 Aug 2020 11:57:56 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bc49v5lMWz3d8p; Wed, 26 Aug 2020 11:57:55 +0000 (UTC) (envelope-from bogorodskiy@gmail.com) Received: by mail-lf1-x12b.google.com with SMTP id y26so839116lfe.2; Wed, 26 Aug 2020 04:57:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=+PcVHigEh4qz/E0WIDCc9p3WCpmSb8WrugiuupgQQCQ=; b=VcOKcMCtq9tEODKjg7Rq1ezkFCDWrUSwcHw/K4pkuqtiqkwAcqIA2AWYTznqAKSi4b 0kNYhkbKk/B2ezKU2l0AXrgaC4eBvoyQ6Ek5kUVTNwj0Hn7cgS8k/JTLMiKHEiRI99jU F15U7Ct6PDr7dcRH7Ihz3z3SeHPwx9UY1mi7+scEpkQopi5MO/sN8YWgLSOdj7YacJdM gHyNwfxZ7cG4zFNHNYBfFbbkKUa6X36ACaoTu0ADq7HcxNpmqeeqepzmU3QMvNufLnq4 diPN41fgYT7fHQ9x6lSZP9KWO7jdAj/mscJljyRJkKF+cXLVApvrIJZgDkiM4ktBfj/d 8dDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to; bh=+PcVHigEh4qz/E0WIDCc9p3WCpmSb8WrugiuupgQQCQ=; b=rdMJ0QBuN5HMPUnMlDsTUUgI/xLAlgwWdckfy6xwmjNbHj2ysojNA9nS940uCt6ABi Hi6BhzJYzua+Ti9anbNo+oFG/Y5VbGWAnTHJ8fPcz4sd1MWE/gZWyOOVBLiecCci2ffx yXqHCduVxz/ctXQAg22pQ3n5cBqjrpLPTC/6LaK2mt7wG6QcN4n/CjbHdvXl8rbDaoIB xibN76qwujc8r21CfpEEPXVgq/2+6XgfPPBZC803DXoD6E9WAVw4vjssR7P4nFmJPzbF atI8obCT9mEUodb5ieS/xemwX06xALtXJ3eyaQqskecJZeutlZsyNLZcbEuPCBjbRF9/ BKPw== X-Gm-Message-State: AOAM5307D49psYuWb5xTsyQGCwS5Vqs+uyLWRaQ8WhUZyYyBaP+04aZL Wohd5W17bo0b7JH1b5D7YXnuRzHz0La7vQ== X-Google-Smtp-Source: ABdhPJzlfJzHZF8rB+5GcZeiVJBDXqz+6gpJMesZtmRY/LU0yw4voi4d5XV2Jm0W3RVk8t96a3FT0w== X-Received: by 2002:a19:4acd:: with SMTP id x196mr185860lfa.118.1598443073604; Wed, 26 Aug 2020 04:57:53 -0700 (PDT) Received: from kloomba ([95.104.140.4]) by smtp.gmail.com with ESMTPSA id r1sm512490lff.55.2020.08.26.04.57.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Aug 2020 04:57:52 -0700 (PDT) Sender: Roman Bogorodskiy Date: Wed, 26 Aug 2020 15:57:43 +0400 From: Roman Bogorodskiy To: Jamie Gritton Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r364791 - head/usr.sbin/jail Message-ID: <20200826115743.GA1791@kloomba> References: <202008260043.07Q0h0kH077834@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="GvXjxJ+pjyke8COw" Content-Disposition: inline In-Reply-To: <202008260043.07Q0h0kH077834@repo.freebsd.org> X-Rspamd-Queue-Id: 4Bc49v5lMWz3d8p X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, 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 11:57:56 -0000 --GvXjxJ+pjyke8COw Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Jamie Gritton wrote: > Author: jamie > Date: Wed Aug 26 00:42:59 2020 > New Revision: 364791 > URL: https://svnweb.freebsd.org/changeset/base/364791 >=20 > Log: > Handle jail.conf variables that have the same names as parameters. > =20 > PR: 248444 > Submitted by: Akos Somfai > Reported by: Markus Stoff >=20 > Modified: > head/usr.sbin/jail/config.c >=20 > Modified: head/usr.sbin/jail/config.c > =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 > --- 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 =3D 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] =3D np; > np->flags |=3D intparams[ipnum].flags; > break; Looks like it's causing jail(8) to segfault, at least when using with poudriere: $ [00:00:00] Creating the reference jail... done [00:00:07] Mounting system devices for current-local [00:00:07] Mounting ports/packages/distfiles [00:00:07] Using packages from previously failed build: /usr/local/poudrier= e/data/packages/current-local/.building [00:00:07] Mounting ccache from: /var/cache/ccache [00:00:07] Mounting packages from: /usr/local/poudriere/data/packages/curre= nt-local [00:00:07] Copying /var/db/ports from: /usr/local/etc/poudriere.d/current-l= ocal-options [00:00:07] Appending to make.conf: /usr/local/etc/poudriere.d/current-make.= conf /etc/resolv.conf -> /usr/local/poudriere/data/.m/current-local/ref/etc/reso= lv.conf [00:00:07] Starting jail current-local Segmentation fault (core dumped) [00:00:08] Cleaning up [00:00:08] Unmounting file systems $ $ lldb /usr/sbin/jail --core /tmp/jail.core (lldb) target create "/usr/sbin/jail" --core "/tmp/jail.core" Core file '/tmp/jail.core' (x86_64) was loaded. (lldb) bt all * thread #1, name =3D 'jail', stop reason =3D signal SIGSEGV * frame #0: 0x000000000020c3fb jail`add_param(j=3D0x0000000800a09000, p= =3D, ipnum=3D, value=3D) at config.c= :399:16 frame #1: 0x0000000000207e08 jail`main(argc=3D8, argv=3D0x00007fffffffe= 8f0) at jail.c:0 frame #2: 0x0000000000206e10 jail`_start(ap=3D, cleanup=3D= ) at crt1_c.c:75:7 (lldb)=20 This works fine when I back out this change. Roman Bogorodskiy --GvXjxJ+pjyke8COw Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEi6TfKtFPmbY34ABwyW1f/gjCImoFAl9GTjUACgkQyW1f/gjC ImoeOgf9F6jI1XL7GLVdbu+Us3qRhVnxcIdRd/L1aL/eWMCwv3TfFOuf9HnOkqiv 64kjuuAFu4VCL5afNYFYjuk7vaFTrC5/W1Kq8TS6bKyuEbck3e95V4HfKCjcahVS WZQJp4AIJqz2N1Bmv7jfk7f3zXj+K6hRwTI3AawxCyxFGEmr21+5KLwFRqi+htRl rYxk94vy43zAwU56pP3Jpl+Jxgu324r5cFIOJz6wCK/UN79kcCzq7NgiWiYTTrIv +BqdqhYmDgDdr4X14Fmq951RrpJgGTHiMCjilto5u5wDUMR7q/Z/ltxG8lzFmFOA dG7aMPbZebUO7wb+s0Jq9Uco/AONGg== =JUYG -----END PGP SIGNATURE----- --GvXjxJ+pjyke8COw--