summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Pöhn <sebastian.poehn@gmail.com>2015-04-20 09:19:20 +0200
committerLuis Henriques <luis.henriques@canonical.com>2015-04-29 11:26:32 +0100
commitee446a4d19dd24463ea5f830ae9a26238923f6df (patch)
treec29a2f55cfa6e5337993583f0414f289f547ede3
parentfb8aa6acf19e19953b9bd25c52409406a0f7ea62 (diff)
downloadlinux-stable-ee446a4d19dd24463ea5f830ae9a26238923f6df.tar.gz
linux-stable-ee446a4d19dd24463ea5f830ae9a26238923f6df.tar.bz2
linux-stable-ee446a4d19dd24463ea5f830ae9a26238923f6df.zip
ip_forward: Drop frames with attached skb->sk
commit 2ab957492d13bb819400ac29ae55911d50a82a13 upstream. 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: Luis Henriques <luis.henriques@canonical.com>
-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 787b3c294ce6..d5410b57da19 100644
--- a/net/ipv4/ip_forward.c
+++ b/net/ipv4/ip_forward.c
@@ -81,6 +81,9 @@ int ip_forward(struct sk_buff *skb)
if (skb->pkt_type != PACKET_HOST)
goto drop;
+ if (unlikely(skb->sk))
+ goto drop;
+
if (skb_warn_if_lro(skb))
goto drop;