summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorGao Feng <fgao@ikuai8.com>2016-09-13 08:49:18 +0800
committerPablo Neira Ayuso <pablo@netfilter.org>2016-09-13 10:50:56 +0200
commit4440a2ab3b9f40dddbe006331ef0659c76859296 (patch)
tree0fd1a6441ee46cc957ec089b158af8ca0efa90f8 /include/net
parentecfcdfec7e0cc64215a194044305f02a5a836e6d (diff)
downloadlinux-4440a2ab3b9f40dddbe006331ef0659c76859296.tar.gz
linux-4440a2ab3b9f40dddbe006331ef0659c76859296.tar.bz2
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 'include/net')
-rw-r--r--include/net/netfilter/nf_conntrack_synproxy.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack_synproxy.h b/include/net/netfilter/nf_conntrack_synproxy.h
index 6793614e6502..e6937318546c 100644
--- a/include/net/netfilter/nf_conntrack_synproxy.h
+++ b/include/net/netfilter/nf_conntrack_synproxy.h
@@ -27,6 +27,20 @@ static inline struct nf_conn_synproxy *nfct_synproxy_ext_add(struct nf_conn *ct)
#endif
}
+static inline bool nf_ct_add_synproxy(struct nf_conn *ct,
+ const struct nf_conn *tmpl)
+{
+ if (tmpl && nfct_synproxy(tmpl)) {
+ if (!nfct_seqadj_ext_add(ct))
+ return false;
+
+ if (!nfct_synproxy_ext_add(ct))
+ return false;
+ }
+
+ return true;
+}
+
struct synproxy_stats {
unsigned int syn_received;
unsigned int cookie_invalid;