This is a note to let you know that I've just added the patch titled
net: flow_dissector: fail on evil iph->ihl
to the 3.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-flow_dissector-fail-on-evil-iph-ihl.patch
and it can be found in the queue-3.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 3fd3ed1e1b114b720da50addbe28a27df95a1cb8 Mon Sep 17 00:00:00 2001
From: Jason Wang <[email protected]>
Date: Fri, 1 Nov 2013 15:01:10 +0800
Subject: net: flow_dissector: fail on evil iph->ihl
From: Jason Wang <[email protected]>
[ Upstream commit 6f092343855a71e03b8d209815d8c45bf3a27fcd ]
We don't validate iph->ihl which may lead a dead loop if we meet a IPIP
skb whose iph->ihl is zero. Fix this by failing immediately when iph->ihl
is evil (less than 5).
This issue were introduced by commit ec5efe7946280d1e84603389a1030ccec0a767ae
(rps: support IPIP encapsulation).
Signed-off-by: Jason Wang <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: Petr Matousek <[email protected]>
Cc: Michael S. Tsirkin <[email protected]>
Cc: Daniel Borkmann <[email protected]>
Acked-by: Eric Dumazet <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
net/core/flow_dissector.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -40,7 +40,7 @@ again:
struct iphdr _iph;
ip:
iph = skb_header_pointer(skb, nhoff, sizeof(_iph), &_iph);
- if (!iph)
+ if (!iph || iph->ihl < 5)
return false;
if (ip_is_fragment(iph))
Patches currently in stable-queue which might be from [email protected] are
queue-3.12/net-flow_dissector-fail-on-evil-iph-ihl.patch
queue-3.12/virtio-net-correctly-handle-cpu-hotplug-notifier-during-resuming.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
