aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorSebastian Pöhn <sebastian.poehn@gmail.com>2015-04-20 09:19:20 +0200
committerSasha Levin <sasha.levin@oracle.com>2015-05-11 07:07:55 -0400
commit7aca2472093e9353793faeede03c94d00ce42fb1 (patch)
treee00b6ccbadebb55fabb8be21f7367ea4cd3c82f0 /net
parente13f6f2b39c4d91371c0ede88b136f364a6ffd6d (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: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net')
-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;