From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752173AbdAMPpr (ORCPT ); Fri, 13 Jan 2017 10:45:47 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:61271 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751771AbdAMPpg (ORCPT ); Fri, 13 Jan 2017 10:45:36 -0500 From: Arnd Bergmann To: Pablo Neira Ayuso Cc: Arnd Bergmann , Patrick McHardy , Jozsef Kadlecsik , "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Xin Long , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] netfilter: ipt_CLUSTERIP: fix build error without procfs Date: Fri, 13 Jan 2017 16:41:03 +0100 Message-Id: <20170113154204.2737978-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:7O7WVPMaob8Jcf/adbcq6Sz4xQlWs95xySRnRm1P/7QVuxKLkHm JSt/uqJGw7CWB6J2AANyn+aTvbx42QibXzqSvOnnbV70XFcYF46GZoX08lOs29sZ2FrOkzG sUMCI1bkgT+XyeWQ4kL0L4tLsMRNd2sRtljmU+8lvGwe0y7CiXlrn30gvoN8M/RrM3al7fb iXNF13JMk7yx+MFKVsKQw== X-UI-Out-Filterresults: notjunk:1;V01:K0:GsiIeOCZk0w=:DgsyrCmV1fpckeJtCH4Vm+ mPamJj93aQ3OFL72bDOkuBTR4Td3LEVoTXzeqonk9VX32osqyLLrDildTt/MIWb6mWGgq+Q9s McdqSynAElMY5gnAjrPnokRfWQa1CxWB8inwUcAJNlXxw3KcK1tiI1Lqfq9A2lURXI+UP0R+x /CJXVatCFcS1wpnbnBBuGCXqyy2kPrsYerVhTe8N+0NaBSudkZ/BxyyzbcjDvA0bDAbBFx4Gf 6kimfE2ONtpToO2tnUahuWNFIfk0uUnWTr6qDLgHki10oAVIwIQuoAZc+g+y5QSEg4eAsJQae GZ5Bq3t45XOJmSBynpU+zqkFK2QNa7LP9prG5ur21K+o4gCKyUgT7O3nS2JrvbKrAHOr7uXph zKICTESi73IjDVp0s6u8eNL86uSqK7v7ku6Bze7L1Hf+OF94tPFG+yQbBAK4L+qU5RD5fxMxb PL56SdvxyXbZ80FK9JjSplfpcta6WwmWfg20kr4ulnYCWz0lXyQvKOxYBEksmLpAXrs5ttWJG d9Tbbi3IoPQjjMtrN+QkVfdpRcVze59U3wMa9PvAzaTPb2DGU2PeNNu35/2wOG403FE0XbZTf ki0VkE0vorFguUQsW18bNcKV8nzFx6FLZdPeTlFCTQWam0fLwX1Q7FO3KilWEcG2CV8LDo332 jEUY4RIXMXkzzunc76yBdhWe8HbMlJuIFBq4JMVK3kV++FrCe/bdgapWU9iNV1P5rgxo= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We can't access c->pde if CONFIG_PROC_FS is disabled: net/ipv4/netfilter/ipt_CLUSTERIP.c: In function 'clusterip_config_find_get': net/ipv4/netfilter/ipt_CLUSTERIP.c:147:9: error: 'struct clusterip_config' has no member named 'pde' This moves the check inside of another #ifdef. Fixes: 6c5d5cfbe3c5 ("netfilter: ipt_CLUSTERIP: check duplicate config when initializing") Signed-off-by: Arnd Bergmann --- net/ipv4/netfilter/ipt_CLUSTERIP.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c index 1e38d8bf5631..52f26459efc3 100644 --- a/net/ipv4/netfilter/ipt_CLUSTERIP.c +++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c @@ -144,7 +144,12 @@ clusterip_config_find_get(struct net *net, __be32 clusterip, int entry) rcu_read_lock_bh(); c = __clusterip_config_find(net, clusterip); if (c) { - if (!c->pde || unlikely(!atomic_inc_not_zero(&c->refcount))) +#ifdef CONFIG_PROC_FS + if (!c->pde) + c = NULL; + else +#endif + if (unlikely(!atomic_inc_not_zero(&c->refcount))) c = NULL; else if (entry) atomic_inc(&c->entries); -- 2.9.0