diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-08 15:43:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-10-08 15:43:12 +0200 |
| commit | 4e1a606d552de03aec2b1fd157011bf012fcc870 (patch) | |
| tree | 7d7683fc2d5286a36782df572f475abb3bb2e173 /include/linux/netfilter.h | |
| parent | 8ebfe885c65ec82a0b1e955cf99ed62664e84414 (diff) | |
| parent | 0238df646e6224016a45505d2c111a24669ebe21 (diff) | |
| download | cachepc-linux-4e1a606d552de03aec2b1fd157011bf012fcc870.tar.gz cachepc-linux-4e1a606d552de03aec2b1fd157011bf012fcc870.zip | |
Merge 4.19-rc7 into tty-next
We want the fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/netfilter.h')
| -rw-r--r-- | include/linux/netfilter.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index 07efffd0c759..bbe99d2b28b4 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h @@ -215,6 +215,8 @@ static inline int nf_hook(u_int8_t pf, unsigned int hook, struct net *net, break; case NFPROTO_ARP: #ifdef CONFIG_NETFILTER_FAMILY_ARP + if (WARN_ON_ONCE(hook >= ARRAY_SIZE(net->nf.hooks_arp))) + break; hook_head = rcu_dereference(net->nf.hooks_arp[hook]); #endif break; |