From: Aaron Conole Date: Wed, 21 Sep 2016 15:35:05 +0000 (-0400) Subject: netfilter: Only allow sane values in nf_register_net_hook X-Git-Tag: Ubuntu-5.10.0-12.13~11771^2~67^2~13 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d4bb5caa9cc1a802ba25f605b24b5640c025806b;p=mirror_ubuntu-hirsute-kernel.git netfilter: Only allow sane values in nf_register_net_hook This commit adds an upfront check for sane values to be passed when registering a netfilter hook. This will be used in a future patch for a simplified hook list traversal. Signed-off-by: Aaron Conole Signed-off-by: Pablo Neira Ayuso --- diff --git a/net/netfilter/core.c b/net/netfilter/core.c index c8faf8102394..67b74287535d 100644 --- a/net/netfilter/core.c +++ b/net/netfilter/core.c @@ -89,6 +89,11 @@ int nf_register_net_hook(struct net *net, const struct nf_hook_ops *reg) struct nf_hook_entry *entry; struct nf_hook_ops *elem; + if (reg->pf == NFPROTO_NETDEV && + (reg->hooknum != NF_NETDEV_INGRESS || + !reg->dev || dev_net(reg->dev) != net)) + return -EINVAL; + entry = kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) return -ENOMEM;