Skip to content

Commit 4908d5a

Browse files
Florian Westphalummakynes
authored andcommitted
netfilter: conntrack: fix extension size table
The size table is incorrect due to copypaste error, this reserves more size than needed. TSTAMP reserved 32 instead of 16 bytes. TIMEOUT reserved 16 instead of 8 bytes. Fixes: 5f31edc ("netfilter: conntrack: move extension sizes into core") Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent 23a3bfd commit 4908d5a

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

net/netfilter/nf_conntrack_extend.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ static const u8 nf_ct_ext_type_len[NF_CT_EXT_NUM] = {
4040
[NF_CT_EXT_ECACHE] = sizeof(struct nf_conntrack_ecache),
4141
#endif
4242
#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
43-
[NF_CT_EXT_TSTAMP] = sizeof(struct nf_conn_acct),
43+
[NF_CT_EXT_TSTAMP] = sizeof(struct nf_conn_tstamp),
4444
#endif
4545
#ifdef CONFIG_NF_CONNTRACK_TIMEOUT
46-
[NF_CT_EXT_TIMEOUT] = sizeof(struct nf_conn_tstamp),
46+
[NF_CT_EXT_TIMEOUT] = sizeof(struct nf_conn_timeout),
4747
#endif
4848
#ifdef CONFIG_NF_CONNTRACK_LABELS
4949
[NF_CT_EXT_LABELS] = sizeof(struct nf_conn_labels),

0 commit comments

Comments
 (0)