aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorFlorian Westphal2013-02-11 17:22:38 -0600
committerGreg Kroah-Hartman2013-05-11 15:53:55 -0500
commit79293de3160850689a436a072f51037493db73b8 (patch)
tree1292090cbd70afd0b5f6c79461c1fe45e06c481c /net
parentfc27819bea8a7791c8a95e0db258389d3cb00887 (diff)
downloadkernel-video-79293de3160850689a436a072f51037493db73b8.tar.gz
kernel-video-79293de3160850689a436a072f51037493db73b8.tar.xz
kernel-video-79293de3160850689a436a072f51037493db73b8.zip
netfilter: ctnetlink: don't permit ct creation with random tuple
commit 442fad9423b78319e0019a7f5047eddf3317afbc upstream. Userspace can cause kernel panic by not specifying orig/reply tuple: kernel will create a tuple with random stack values. Problem is that tuple.dst.dir will be random, too, which causes nf_ct_tuplehash_to_ctrack() to return garbage. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@gnumonks.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_netlink.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c
index 627b0e50b23..a081915e053 100644
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -1705,6 +1705,9 @@ ctnetlink_new_conntrack(struct sock *ctnl, struct sk_buff *skb,
1705 if (nlh->nlmsg_flags & NLM_F_CREATE) { 1705 if (nlh->nlmsg_flags & NLM_F_CREATE) {
1706 enum ip_conntrack_events events; 1706 enum ip_conntrack_events events;
1707 1707
1708 if (!cda[CTA_TUPLE_ORIG] || !cda[CTA_TUPLE_REPLY])
1709 return -EINVAL;
1710
1708 ct = ctnetlink_create_conntrack(net, zone, cda, &otuple, 1711 ct = ctnetlink_create_conntrack(net, zone, cda, &otuple,
1709 &rtuple, u3); 1712 &rtuple, u3);
1710 if (IS_ERR(ct)) 1713 if (IS_ERR(ct))