]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
netfilter: ipt_CLUSTERIP: fix build error without procfs
authorArnd Bergmann <arnd@arndb.de>
Fri, 13 Jan 2017 15:41:03 +0000 (16:41 +0100)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 18 Jan 2017 19:59:22 +0000 (20:59 +0100)
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 <arnd@arndb.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/ipv4/netfilter/ipt_CLUSTERIP.c

index a6b8c1a4102ba7ab07efbcf504fa7ca4025c6f19..0a783cd73faf25d9ec4d7605759038e4e0aef345 100644 (file)
@@ -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) {
        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);
                        c = NULL;
                else if (entry)
                        atomic_inc(&c->entries);