iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: accommodate different kconfig in nf_set_hooks_head

Browse Source 
When CONFIG_NETFILTER_INGRESS is unset (or no), we need to handle
the request for registration properly by dropping the hook.  This
releases the entry during the set.

Fixes: e3b37f11e6 ("netfilter: replace list_head with single linked list")
Signed-off-by: Aaron Conole <aconole@bytheb.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Aaron Conole
2016-09-28 11:35:15 -04:00
committed by Pablo Neira Ayuso
parent 5119e4381a
commit 7816ec564e
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
net/netfilter/core.c
View File

@@ -90,10 +90,12 @@ static void nf_set_hooks_head(struct net *net, const struct nf_hook_ops *reg,
{ {
switch (reg->pf) { switch (reg->pf) {
case NFPROTO_NETDEV: case NFPROTO_NETDEV:
#ifdef CONFIG_NETFILTER_INGRESS
/* We already checked in nf_register_net_hook() that this is /* We already checked in nf_register_net_hook() that this is
* used from ingress. * used from ingress.
*/ */
rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry); rcu_assign_pointer(reg->dev->nf_hooks_ingress, entry);
#endif
break; break;
default: default:
rcu_assign_pointer(net->nf.hooks[reg->pf][reg->hooknum], rcu_assign_pointer(net->nf.hooks[reg->pf][reg->hooknum],
@@ -107,10 +109,15 @@ int nf_register_net_hook(struct net *net, const struct nf_hook_ops *reg)
struct nf_hook_entry *hooks_entry; struct nf_hook_entry *hooks_entry;
struct nf_hook_entry *entry; struct nf_hook_entry *entry;
if (reg->pf == NFPROTO_NETDEV && if (reg->pf == NFPROTO_NETDEV) {
(reg->hooknum != NF_NETDEV_INGRESS || #ifndef CONFIG_NETFILTER_INGRESS
!reg->dev || dev_net(reg->dev) != net)) if (reg->hooknum == NF_NETDEV_INGRESS)
return -EINVAL; return -EOPNOTSUPP;
#endif
if (reg->hooknum != NF_NETDEV_INGRESS ||
!reg->dev || dev_net(reg->dev) != net)
return -EINVAL;
}
entry = kmalloc(sizeof(*entry), GFP_KERNEL); entry = kmalloc(sizeof(*entry), GFP_KERNEL);
if (!entry) if (!entry)