From patchwork Wed Mar 13 21:15:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 160276 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp14768294jad; Wed, 13 Mar 2019 14:16:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqx3b8c+3V5SbEZs/4NK6YoLqfaWvoM6OXKU9Ju/qJL6+m3V83jWa3lz52EtEjc3eJhQtzkg X-Received: by 2002:a63:2bd5:: with SMTP id r204mr42575240pgr.48.1552511814591; Wed, 13 Mar 2019 14:16:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552511814; cv=none; d=google.com; s=arc-20160816; b=PpJviddRXvGHtAIvRaAYBtkRtir0/BCp9YFHIKZf1it0O/d/aR+NgP6BxPLN9ch6O8 muyAKSZgzW0vKXY5Dv8jkJcuID+zxmny3lso+jT9mJpo7yFC1i5g4Axe8xn4fm0SuVu3 DRteseYMePSVv1HfoucFrO4DPoLrecRF1iM1mD/eyciKVcQ7WSURxWZqgw09i5xIkdeP cDt+S6TkYlBt8SimwsmutXhT9Zszs4DJI2WPWoUUcPR6fbGLoywt0KY6BWmOvFd4w6Kg +hDk+alBiLRUH7A/m854qx1XOIx7Ilala13MzJYCcuzq31yaU9KV7IUh2tLb9N5UdNRf 4dpg== 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 :message-id:date:subject:cc:to:from; bh=xdWtqL07HeWmgwkAG6AFpe1imr17jfUIuxR6CFbPoKc=; b=b5l6hASPDMZfQ2u3Z9XmydDg3u2KfuuogCHLw5z83oA7UijME57+igoHe4hAcqMmm+ WDtqVEFE5MBBRkmUYOQ5vcjuxGy2nwp65T7i8xP9VOB6fdi7yj+0QRoa5gJ7IduGraKj ezvM0WAaC0K6ocEjeIBjUP+cI9vsXHyYP6c45HHFoaSZLTejFzfIfmGYpqcqKdmYkWzN 0r3DCtQX3S4pz2Git2ByvGaSvuurB1YWG6O1XBcHzyyr5D8hoy82zHc1AzHX+jO+ZxEV Q6aUTx5H440ycuTbllkA9tY722SUF1U1VOiZTKK7XV/lW4lS6emuHTK6wNGRlrlTE3Lj sPSg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 j2si11915988pfb.268.2019.03.13.14.16.54; Wed, 13 Mar 2019 14:16:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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 linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727413AbfCMVQw (ORCPT + 31 others); Wed, 13 Mar 2019 17:16:52 -0400 Received: from mout.kundenserver.de ([212.227.126.131]:47699 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726125AbfCMVQw (ORCPT ); Wed, 13 Mar 2019 17:16:52 -0400 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.129]) with ESMTPA (Nemesis) id 1MUpCz-1hUCQl4025-00QlQA; Wed, 13 Mar 2019 22:16:27 +0100 From: Arnd Bergmann To: Pablo Neira Ayuso , Jozsef Kadlecsik , Florian Westphal , "David S. Miller" Cc: Arnd Bergmann , =?utf-8?b?TcOhdMOpIEVja2w=?= , Taehee Yoo , Randy Dunlap , Stephen Rothwell , Fernando Fernandez Mancera , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [v2] netfilter: fix NETFILTER_XT_TARGET_TEE dependencies Date: Wed, 13 Mar 2019 22:15:59 +0100 Message-Id: <20190313211622.389120-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:ViYmkt/0yWEJ8JAgkQj2hEb31NsJJu9rstIeqmudaADr+b2UtI9 kY2mex6FdhmXesDTn5RrKzcg5qVU2XtWs0ECem5A5DOsL6DldnHPrLRKRD6k+htUJ2XDQFQ uEiAw4tFGcMuloWGRstcaeY6NxiaZjOre5FQjnHHIYGKVeev71Mp/JC7ZN/Vle/mm+2mAET Vgfyh1YjcN+2eAEk4BHag== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:rKkX6Hf2vjk=:LujhIAn3tv7yaP0EPgmzz+ /2pAshGdlTUi1Z/XezG4dJfozA2KlHPKNeQ5VDeWbkhO5YPDq/mnxoK8ewBxHhrwKZdIlDKLP jhct/sAxxb8GuP2R1W/VSKXU5dRfeiINUiNQC8iHV8xcQg36LDuCNpQhq/ZByY/LUV0jRxebV laEyOAndzEO6K9FqvbAhpqxJNu7vR4Lb/iHLziWFTtLI1kPFwqqv3+njmMdm5ivUlIZ7+ytMY NrwR7m+YvSVrgeMmUPLNRiONUi5xK7fFQa6jkFk+rgVu/O4LyCBKMa3rDeOEuE2qlbsPUOKNs kPfU5zEhSBIMu3Ag9+DLYfAB9torKp2l1cWgVegyTHqpHROqjhAKciN+NQRTJIiyFbm3FQPDr 80pwUeim4Ajd08mei9OavDimt64B2EHrjLRWR4AKVOxT3qdf38zuANY+RMIVL5dU3ek1VG0HZ pQe+0ttNO+jy/Cgbl/opx+Q+upv3Twf6eejm7c81u5+K4T3GxbwWbiDgJsPd9WrrRKzsAR88T g8wiO5tHW5uGDp7rFPFDwGDN7Yke6dYY6dNz55jIAMbSyETCZKQpCrMWmSmy++lZkJdFn6msY p30BO7URoWDJ1IAY8wPJUqQ4k7dmR5FBAK97dkMha00A/Mf6yoyx/LzKsIoOftb3HRDbWpJWA iv57CmVG+UHsmiWaZ4ZnSIkbibzEO1+53HAgA5YfdRbO/lohIpTzqcEH0Xmmr7n88x/AHQW8H L8JV+i3p1z21xqtinFf+rA0IAhAoZwNisCcTuU72NfTDkCFfaxswJ/wWOfk= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Resending this one, I had sent another version before last July, and then Máté Eckl did a combined version that I thought was sufficient, but I had left my old patch in the randconfig build tree, so I failed to notice that it was still required. Taehee Yoo also prepared a patch to address this, but that patch was never merged, and I suspect it did not catch all cases either, so we still need mine. --- net/netfilter/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.20.0 diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 964bc317ad0a..ca3ba7548998 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -1008,6 +1008,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---