From patchwork Thu Mar 21 11:28:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 160777 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp680814jan; Thu, 21 Mar 2019 04:29:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqxbQGxDjeZLDFq+ZURhTmhWaJrd5u50dQCeI7D/KbEqm9L3+dgfv390OzT3nUYACaQbs6n5 X-Received: by 2002:aa7:90c7:: with SMTP id k7mr2780423pfk.186.1553167749076; Thu, 21 Mar 2019 04:29:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553167749; cv=none; d=google.com; s=arc-20160816; b=zufK/XjqvdfjCjW3sMvG4a4YBGacq9W+hqeLIJY6wRwpxgwcc02UnOegyYkhtHl+oh J2nHhHRaKlTt82UvemmT1hEcD7lce0dVD2bTf3pGJLvfm18MJIaZvcblK8Y4oqsIRQ7B okcC5xg0n05/hjJlahrvmqBkjuF9vWmoNxu6z+gDZqKBED7u4MNqLaypHlL80WZcx4zm 4BD73kNhfk2GY8EnhJ7r+rab4kRH0sv7fJ1XMP6vWzu+yD3+aJ8CNX1TiYiUt8iHHNH5 HHkyJU/1TKyjUMeeTOzuuquVxgyRXwCg0gqmSzgf1faniXy5fr5hNCRgZUx1Yk9+hpuw Z/vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=hayrH5ZdKETs6iW8dZPXRVH0MtG3VmZ8e5kWn3nYtjY=; b=AcAoqHUWKPZMvNl7OFQF0+Vgo0h6d1gqBj7o8LU7Rq8GKnBu/5n35+opb92mcTodzc 1+JWMu4JxOE34pOqsm0O6uG0emvOWO5rvDGpYoGlqSf2cjS2+nUaV2IybbRgp0lVzUxF uaKZAxDzyyZEnDeccKU/uiuMstqfchOrRvYFHkf0PFfGCc5r4lioEs69Edp9hoXWCbhl h+FchjTYF2LZw+9h1di2S7n9bwkPOET2YmlAr4TDVAcSBoHA7ZMuj8GOilYb7Fe8GNKf 5P9kKphOlheAH1FqQcfIk8K6wt/cO55OhtUEnFVGCGHv+QVp+rppTKXrwObzuEgU3P4f mM6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e67si4608155plb.107.2019.03.21.04.29.08; Thu, 21 Mar 2019 04:29:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728104AbfCUL3D (ORCPT + 9 others); Thu, 21 Mar 2019 07:29:03 -0400 Received: from mail.us.es ([193.147.175.20]:42770 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728059AbfCUL3B (ORCPT ); Thu, 21 Mar 2019 07:29:01 -0400 Received: from antivirus1-rhel7.int (unknown [192.168.2.11]) by mail.us.es (Postfix) with ESMTP id 58E4CC230F for ; Thu, 21 Mar 2019 12:28:59 +0100 (CET) Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id 383E7BAAB4 for ; Thu, 21 Mar 2019 12:28:59 +0100 (CET) Received: by antivirus1-rhel7.int (Postfix, from userid 99) id 2C750BAAB2; Thu, 21 Mar 2019 12:28:59 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on antivirus1-rhel7.int X-Spam-Level: X-Spam-Status: No, score=-108.2 required=7.5 tests=ALL_TRUSTED,BAYES_50, SMTPAUTH_US2,USER_IN_WHITELIST autolearn=disabled version=3.4.1 Received: from antivirus1-rhel7.int (localhost [127.0.0.1]) by antivirus1-rhel7.int (Postfix) with ESMTP id C8A58BAAB0; Thu, 21 Mar 2019 12:28:53 +0100 (CET) Received: from 192.168.1.97 (192.168.1.97) by antivirus1-rhel7.int (F-Secure/fsigk_smtp/550/antivirus1-rhel7.int); Thu, 21 Mar 2019 12:28:53 +0100 (CET) X-Virus-Status: clean(F-Secure/fsigk_smtp/550/antivirus1-rhel7.int) Received: from salvia.here (unknown [195.39.71.253]) (Authenticated sender: pneira@us.es) by entrada.int (Postfix) with ESMTPA id 67D244265A4E; Thu, 21 Mar 2019 12:28:53 +0100 (CET) X-SMTPAUTHUS: auth mail.us.es From: Pablo Neira Ayuso To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 4/9] netfilter: fix NETFILTER_XT_TARGET_TEE dependencies Date: Thu, 21 Mar 2019 12:28:40 +0100 Message-Id: <20190321112845.10627-5-pablo@netfilter.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190321112845.10627-1-pablo@netfilter.org> References: <20190321112845.10627-1-pablo@netfilter.org> MIME-Version: 1.0 X-Virus-Scanned: ClamAV using ClamSMTP Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann With NETFILTER_XT_TARGET_TEE=y and IP6_NF_IPTABLES=m, we get a link error when referencing the NF_DUP_IPV6 module: net/netfilter/xt_TEE.o: In function `tee_tg6': xt_TEE.c:(.text+0x14): undefined reference to `nf_dup_ipv6' The problem here is the 'select NF_DUP_IPV6 if IP6_NF_IPTABLES' that forces NF_DUP_IPV6 to be =m as well rather than setting it to =y as was intended here. Adding a soft dependency on IP6_NF_IPTABLES avoids that broken configuration. Fixes: 5d400a4933e8 ("netfilter: Kconfig: Change select IPv6 dependencies") Cc: Máté Eckl Cc: Taehee Yoo Link: https://patchwork.ozlabs.org/patch/999498/ Link: https://lore.kernel.org/patchwork/patch/960062/ Reported-by: Randy Dunlap Reported-by: Stephen Rothwell Signed-off-by: Arnd Bergmann Signed-off-by: Pablo Neira Ayuso --- net/netfilter/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.11.0 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index d43ffb09939b..6548271209a0 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -1007,6 +1007,7 @@ config NETFILTER_XT_TARGET_TEE depends on NETFILTER_ADVANCED depends on IPV6 || IPV6=n depends on !NF_CONNTRACK || NF_CONNTRACK + depends on IP6_NF_IPTABLES || !IP6_NF_IPTABLES select NF_DUP_IPV4 select NF_DUP_IPV6 if IP6_NF_IPTABLES ---help---