]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
netfilter: conntrack: use u8 for extension sizes again
authorFlorian Westphal <fw@strlen.de>
Sat, 15 Apr 2017 23:29:19 +0000 (01:29 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Wed, 19 Apr 2017 15:55:17 +0000 (17:55 +0200)
commitb3a5db109e0670d6d168e9cd9de4d272a68f7c35
treeae23e5a9d0b2fd061130076bedc9560852cb11ef
parentfaec865db9a79e7452d7fc01a4a409b06d02b479
netfilter: conntrack: use u8 for extension sizes again

commit 223b02d923ecd7c84cf9780bb3686f455d279279
("netfilter: nf_conntrack: reserve two bytes for nf_ct_ext->len")
had to increase size of the extension offsets because total size of the
extensions had increased to a point where u8 did overflow.

3 years later we've managed to diet extensions a bit and we no longer
need u16.  Furthermore we can now add a compile-time assertion for this
problem.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
include/net/netfilter/nf_conntrack_extend.h
net/netfilter/nf_conntrack_core.c