diff options
| author | Gao Feng | 2016-09-13 02:49:18 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2016-09-13 10:50:56 +0200 |
| commit | 4440a2ab3b9f40dddbe006331ef0659c76859296 (patch) | |
| tree | 0fd1a6441ee46cc957ec089b158af8ca0efa90f8 /net/netfilter/nf_conntrack_core.c | |
| parent | netfilter: nf_nat: handle NF_DROP from nfnetlink_parse_nat_setup() (diff) | |
| download | kernel-qcow2-linux-4440a2ab3b9f40dddbe006331ef0659c76859296.tar.gz kernel-qcow2-linux-4440a2ab3b9f40dddbe006331ef0659c76859296.tar.xz kernel-qcow2-linux-4440a2ab3b9f40dddbe006331ef0659c76859296.zip | |
netfilter: synproxy: Check oom when adding synproxy and seqadj ct extensions
When memory is exhausted, nfct_seqadj_ext_add may fail to add the
synproxy and seqadj extensions. The function nf_ct_seqadj_init doesn't
check if get valid seqadj pointer by the nfct_seqadj.
Now drop the packet directly when fail to add seqadj extension to
avoid dereference NULL pointer in nf_ct_seqadj_init from
init_conntrack().
Signed-off-by: Gao Feng <fgao@ikuai8.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nf_conntrack_core.c')
| -rw-r--r-- | net/netfilter/nf_conntrack_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index dd2c43abf9e2..9934b0c93c1e 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c @@ -1035,9 +1035,9 @@ init_conntrack(struct net *net, struct nf_conn *tmpl, if (IS_ERR(ct)) return (struct nf_conntrack_tuple_hash *)ct; - if (tmpl && nfct_synproxy(tmpl)) { - nfct_seqadj_ext_add(ct); - nfct_synproxy_ext_add(ct); + if (!nf_ct_add_synproxy(ct, tmpl)) { + nf_conntrack_free(ct); + return ERR_PTR(-ENOMEM); } timeout_ext = tmpl ? nf_ct_timeout_find(tmpl) : NULL; |