summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pöhn <sebastian.poehn@gmail.com>2015-04-20 09:19:20 +0200
committerWilly Tarreau <w@1wt.eu>2015-05-24 10:10:50 +0200
commitb19feb6e0066835d430c98a2befb00546089895e (patch)
tree1ff137c2117aaf87fa86ff064c180040f5dc2e78
parentb49fbe0a677522c61616715b43d5d59e7c5c05d6 (diff)
ip_forward: Drop frames with attached skb->sk
[ Upstream commit 2ab957492d13bb819400ac29ae55911d50a82a13 ] Initial discussion was: [FYI] xfrm: Don't lookup sk_policy for timewait sockets Forwarded frames should not have a socket attached. Especially tw sockets will lead to panics later-on in the stack. This was observed with TPROXY assigning a tw socket and broken policy routing (misconfigured). As a result frame enters forwarding path instead of input. We cannot solve this in TPROXY as it cannot know that policy routing is broken. v2: Remove useless comment Signed-off-by: Sebastian Poehn <sebastian.poehn@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> (cherry picked from commit fccb908d23fbae3e941e9294590dd94de6b1d822) Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--net/ipv4/ip_forward.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/ip_forward.c b/net/ipv4/ip_forward.c
index a2991bc8e32e..6be434085f3e 100644
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
@@ -56,6 +56,9 @@ int ip_forward(struct sk_buff *skb)
struct rtable *rt; /* Route we use */
struct ip_options * opt = &(IPCB(skb)->opt);
+ if (unlikely(skb->sk))
+ goto drop;
+
if (skb_warn_if_lro(skb))
goto drop;