From owner-freebsd-stable@freebsd.org Tue Aug 20 17:58:03 2019 Return-Path: Delivered-To: freebsd-stable@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 60C9BD7510 for ; Tue, 20 Aug 2019 17:58:03 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) 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 46Cdn71YWPz4d47 for ; Tue, 20 Aug 2019 17:58:03 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 DE6981B15D for ; Tue, 20 Aug 2019 17:58:02 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-wr1-f54.google.com with SMTP id z1so13292532wru.13 for ; Tue, 20 Aug 2019 10:58:02 -0700 (PDT) X-Gm-Message-State: APjAAAXHtvqXugbhhBcwkuWv0Fh4GLLTiCeDrFUlFapJrKFldQz0Ka+5 ylzpI4gM7qaVOlX3VIwdHlAkg4v5kjLywTCc+s4= X-Google-Smtp-Source: APXvYqweXQGKpnzeE5psihv//c+oveaQFjaNWzB8VRCeLcbAc5e6a+mQaB3pBUywcupS5EewKeMsewRoIrbr8+Vh1h8= X-Received: by 2002:a5d:4b8b:: with SMTP id b11mr36866012wrt.294.1566323881528; Tue, 20 Aug 2019 10:58:01 -0700 (PDT) MIME-Version: 1.0 References: <8ef12e33-583e-5b5c-a602-155e396a6a45@stonepile.fi> <47adcb23-b2d5-c70d-beb8-c8bbde6a2973@stonepile.fi> In-Reply-To: <47adcb23-b2d5-c70d-beb8-c8bbde6a2973@stonepile.fi> From: Kyle Evans Date: Tue, 20 Aug 2019 12:57:49 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: ipfw jail keyword broken in 11.3 by jail_getid changes To: FreeBSD-STABLE Mailing List Content-Type: text/plain; charset="UTF-8" X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2019 17:58:03 -0000 On Fri, Aug 2, 2019 at 12:50 AM Ari Suutari via freebsd-stable wrote: > On 1.8.2019 21.19, Kyle Evans wrote: > > On Thu, Aug 1, 2019 at 8:43 AM Kyle Evans wrote: > >> On Thu, Aug 1, 2019 at 1:38 AM Ari Suutari via freebsd-stable > >> wrote: > >>> Hi, > >>> > >>> We have a lot of servers using jails and ipfw rules with > >>> numeric jail ids to limit acess between them (something > >>> like 'allow tcp from from me to me 8086 jail 1 keep-state'). > >>> > >>> This has been working very well for ages. Yesterday, we upgraded > >>> first of these servers to 11.3. During boot there are now messages > >>> like 'ipfw: jail 1 not found' and the rules are not loaded. > >>> > >>> I tracked this down to: > >>> https://reviews.freebsd.org/rS348304 > >>> > >>> ipfw calls jail_getid, which used to just return the id without checking > >>> if string was numeric. In 11.3, the function has been changed to actually > >>> check if the jail with given id exists. > >>> > >>> This doesn't really work in ipfw's context as the rules are loaded before > >>> the jails are actually created. > >>> > >>> Ari S. > >> Hi, > >> > >> I've CC'd Andrey, who tends to work in this area. Apologies for not > >> catching the breakage- I'll whip up a patch unless Andrey objects, but > >> this area feels a bit finnicky. I think a couple of things need to > >> happen: > >> > >> 1.) To fix things -right now-, ipfw should fall back to strtoul if > >> jail_getid fails and only error out if strtoul fails. This restores > >> the functional status quo and still uses jail_getid properly, which is > >> documented to return -1 if the jail does not exist. > >> > > I've created a review for this at [0] -- I can't test it, though, so > > some testing would be appreciated. > > > > Thanks, > > > > Kyle Evans > > > > [0] https://reviews.freebsd.org/D21128 > > Hi, > > I tested your change and can confirm that it fixes the issue. > secteam@ has given this EN-19:17.ipfw to be included in 11.3-RELEASE-p3. Thanks! Kyle Evans