diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:48 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:48 +0800 |
| commit | 421a8ddd1fc901897eee73965b442af4b4dd7095 (patch) | |
| tree | e9bd7aef46f35c1857700b9c52ad24f6a68f957c /net/ipv6/ip6_output.c | |
| parent | 82211c838b558293e48c8fcd816f6609ebc7e4b3 (diff) | |
| parent | d439e869d612dd7a338ac75a4afc3646a5e67370 (diff) | |
Merge tag 'v3.18.29' into linux-linaro-lsk-v3.18lsk-v3.18-16.03
This is the 3.18.29 stable release
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 7b5cb003ee22..9524b4596bf5 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -374,6 +374,9 @@ int ip6_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; |