diff options
| author | Dan Carpenter | 2019-04-06 07:26:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-16 19:41:24 +0200 |
| commit | 743a5a951d4da68d0210a53bf4327b92153f5143 (patch) | |
| tree | 091d4cc47f494af039c291e77b3bbe7c9d72ee0e /net/netfilter | |
| parent | netfilter: ctnetlink: don't use conntrack/expect object addresses as id (diff) | |
| download | kernel-qcow2-linux-743a5a951d4da68d0210a53bf4327b92153f5143.tar.gz kernel-qcow2-linux-743a5a951d4da68d0210a53bf4327b92153f5143.tar.xz kernel-qcow2-linux-743a5a951d4da68d0210a53bf4327b92153f5143.zip | |
netfilter: nf_tables: prevent shift wrap in nft_chain_parse_hook()
[ Upstream commit 33d1c018179d0a30c39cc5f1682b77867282694b ]
I believe that "hook->num" can be up to UINT_MAX. Shifting more than
31 bits would is undefined in C but in practice it would lead to shift
wrapping. That would lead to an array overflow in nf_tables_addchain():
ops->hook = hook.type->hooks[ops->hooknum];
Fixes: fe19c04ca137 ("netfilter: nf_tables: remove nhooks field from struct nft_af_info")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 1af54119bafc..f272f9538c44 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -1496,7 +1496,7 @@ static int nft_chain_parse_hook(struct net *net, if (IS_ERR(type)) return PTR_ERR(type); } - if (!(type->hook_mask & (1 << hook->num))) + if (hook->num > NF_MAX_HOOKS || !(type->hook_mask & (1 << hook->num))) return -EOPNOTSUPP; if (type->type == NFT_CHAIN_T_NAT && |