diff options
| author | Andrey Vagin <avagin@openvz.org> | 2014-03-28 13:54:32 +0400 |
|---|---|---|
| committer | Brett Rogers <brettrogers11@gmail.com> | 2016-02-22 16:32:04 -0800 |
| commit | a7a9d8516ec987f32d62e33594210a0fee392498 (patch) | |
| tree | 013373c0b60a9c64da2e55a89faf5a6109d3ee58 /include | |
| parent | b6ad77af717a40d98627ad297b096d5cb1d36eb9 (diff) | |
| download | kernel_samsung_smdk4412-a7a9d8516ec987f32d62e33594210a0fee392498.tar.gz kernel_samsung_smdk4412-a7a9d8516ec987f32d62e33594210a0fee392498.tar.bz2 kernel_samsung_smdk4412-a7a9d8516ec987f32d62e33594210a0fee392498.zip | |
netfilter: nf_conntrack: reserve two bytes for nf_ct_ext->len
"len" contains sizeof(nf_ct_ext) and size of extensions. In a worst
case it can contain all extensions. Bellow you can find sizes for all
types of extensions. Their sum is definitely bigger than 256.
nf_ct_ext_types[0]->len = 24
nf_ct_ext_types[1]->len = 32
nf_ct_ext_types[2]->len = 24
nf_ct_ext_types[3]->len = 32
nf_ct_ext_types[4]->len = 152
nf_ct_ext_types[5]->len = 2
nf_ct_ext_types[6]->len = 16
nf_ct_ext_types[7]->len = 8
I have seen "len" up to 280 and my host has crashes w/o this patch.
The right way to fix this problem is reducing the size of the ecache
extension (4) and Florian is going to do this, but these changes will
be quite large to be appropriate for a stable tree.
Change-Id: Id44470ab1d54526993927cdda68342e591a5d6c3
Fixes: 5b423f6a40a0 (netfilter: nf_conntrack: fix racy timer handling with reliable)
Cc: Pablo Neira Ayuso <pablo@netfilter.org>
Cc: Patrick McHardy <kaber@trash.net>
Cc: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/netfilter/nf_conntrack_extend.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h index 2dcf31703ac..d9180742ebb 100644 --- a/include/net/netfilter/nf_conntrack_extend.h +++ b/include/net/netfilter/nf_conntrack_extend.h @@ -33,8 +33,8 @@ enum nf_ct_ext_id { /* Extensions: optional stuff which isn't permanently in struct. */ struct nf_ct_ext { struct rcu_head rcu; - u8 offset[NF_CT_EXT_NUM]; - u8 len; + u16 offset[NF_CT_EXT_NUM]; + u16 len; char data[0]; }; |