From patchwork Tue Oct 16 09:11:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 984611 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FIkKK80m"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="I6J1tV41"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42Z8h40vqbz9s55 for ; Tue, 16 Oct 2018 20:11:47 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=SEKBMyDUuD3Mh81DXP9ICDlOLLogoirqtAmMR8V/RL4=; b=FIkKK80mUvgWkb VG0OKzutrYUltUY/WcbS0D5uPIlq/BDHofbvQbSWrj8uINQUgQq8XIePsw941988eVvuay7z1TGGm MuEvZUuyrkGtahe94epc+U7zE1p6m7ZrAvm5YSsZvIRgrm+g984lbTktnUKxH/A6WbKnWa+rnbcRw Tu1BQrsANg2ii0pszrhfjhAJO8jmTuFJ4QBTxLrSBcgYhhOia+SXOQ+BguKYtyDa4lAE5S0FzVwtf jaKE0leBhoUEUMasvTayOaqxCYBGDRRYdG5/qgSx+Pgdq1VbE6ovYqaEu67mHr8jPzbxKPMqK7Nzo IpE32AX/9japOK3iKqCw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gCLO3-0001RQ-Db; Tue, 16 Oct 2018 09:11:35 +0000 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gCLNu-0001Gu-19 for openwrt-devel@lists.openwrt.org; Tue, 16 Oct 2018 09:11:30 +0000 Received: by mail-ed1-x532.google.com with SMTP id v18-v6so20540931edq.12 for ; Tue, 16 Oct 2018 02:11:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+ob5PpFPzJmTWtPMnKVvsG2mS49jaCp26eK7CDSjFQk=; b=I6J1tV41devrqdd1H7ORTtPXg7dsYL0/MCVYF69t0hsagv4+FvA2/1ntGgwT5QbGod dyL+uQiMC8pZtwohR39YiQLKbHpNpeltTeE+ucUl9ffzv8DxZFx80m1qU73W94vMB/Cj 3dqbK40IyXUHRfaGdWopB3iGQyjLBk+tNC3CSZS3snoX5Bd2Itmd/WP92yx6KrNCkuwE X+byFXLJkSKMPbayoF3QjfV1fT1ir/RyA4viD6xVVHQe1i69iTio42utdVtCCnUp5u1V pFaVXc36Xmqbg1DUu+3RRvH13QWc27mh2bjdrtD4nLo5S4ssi8Us9C89i8ymZB1A5lAn r8+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=+ob5PpFPzJmTWtPMnKVvsG2mS49jaCp26eK7CDSjFQk=; b=oGBfd2XrDhw+iIzcFvLsIb0SdVvm/Ks7ddkA14fVgFiB/YFy/RhOs8jSKTpXnsvmHw WzV+/9j/R+YkX2hzHFin5RPdw1lr86crjhxHqabubGNOqhvR8rklVp3TS8nGSoqRdiHx BWze40NqKzMhUTPU4Jx5W+UQ1P1DZGT0kqjygjGrsdUIH9s1Bgsl3qFPN1VSnNx+bni7 zZKaIszRijM50fqhLqxplozjDLAxNt0yMYulJ8p601QWfB1Y85G1EIWkogJPoZt1aYx1 V95QMgAtq6sXhKheQIZ7gWTDCWoK8LM7pEoG/1qA0lat8LPGtbOARTVw24qPH9p2ja7v 44/w== X-Gm-Message-State: ABuFfoh41a7NLXVa1p76CHng1dHRaXhBqRbUloaMG/yOAdtkKUx2l3h9 GdE19IVwCkvOTpeT7CXKQUagNkVKh+c= X-Google-Smtp-Source: ACcGV63qUgx2FVC0AViYZh11ZISgak90zvE6UPFDEgKpeY/Io9YN+2yZKWReyv7ioWjejBPeDpEq0g== X-Received: by 2002:a50:ac76:: with SMTP id w51-v6mr28842644edc.211.1539681071817; Tue, 16 Oct 2018 02:11:11 -0700 (PDT) Received: from debian64.daheim (p200300D5FBC70CFCD63D7EFFFEBDE96E.dip0.t-ipconnect.de. [2003:d5:fbc7:cfc:d63d:7eff:febd:e96e]) by smtp.gmail.com with ESMTPSA id f25-v6sm2818611ejr.44.2018.10.16.02.11.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Oct 2018 02:11:11 -0700 (PDT) Received: from chuck by debian64.daheim with local (Exim 4.91) (envelope-from ) id 1gCLNe-0001RF-5h; Tue, 16 Oct 2018 11:11:10 +0200 From: Christian Lamparter To: openwrt-devel@lists.openwrt.org Date: Tue, 16 Oct 2018 11:11:10 +0200 Message-Id: <20181016091110.5487-1-chunkeey@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181016_021126_113213_2A763501 X-CRM114-Status: GOOD ( 10.72 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:532 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (chunkeey[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid Subject: [OpenWrt-Devel] [PATCH] dnsmasq: fix dnsmasq failure to start when ujail'd X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Darbyshire-Bryant Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This patch fixes jailed dnsmasq running into the following issue: |dnsmasq[1]: cannot read /usr/share/dnsmasq/dhcpbogushostname.conf: No such file or directory |dnsmasq[1]: FAILED to start up |procd: Instance dnsmasq::cfg01411c s in a crash loop 6 crashes, 0 seconds since last crash Fixes: a45f4f50e16 ("dnsmasq: add dhcp-ignore-names support - CERT VU#598349") Signed-off-by: Christian Lamparter --- package/network/services/dnsmasq/files/dnsmasq.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init index 0c786e82c7..9c922eec6c 100644 --- a/package/network/services/dnsmasq/files/dnsmasq.init +++ b/package/network/services/dnsmasq/files/dnsmasq.init @@ -1028,7 +1028,7 @@ dnsmasq_start() procd_set_param respawn procd_add_jail dnsmasq ubus log - procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT + procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE $RFC6761FILE $DHCPBOGUSHOSTNAMEFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom $dnsmasqconffile $dnsmasqconfdir $resolvfile $user_dhcpscript /etc/hosts /etc/ethers /sbin/hotplug-call $EXTRA_MOUNT $DHCPSCRIPT procd_add_jail_mount_rw /var/run/dnsmasq/ $leasefile procd_close_instance