diff options
author | David S. Miller <davem@davemloft.net> | 2017-05-18 16:11:32 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-18 16:11:32 -0400 |
commit | c6cd850d6568872f66fc4a4582f34f9b910066ca (patch) | |
tree | e9a6370f7b0ce110e2916a6288a8fb0ee8323e37 /net/ipv6/ip6_output.c | |
parent | 27902f08065ba61514c331b7d6e85635c1655d82 (diff) | |
parent | 8b4822de59d5d9919b9b045183a36c673ce20b73 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r-- | net/ipv6/ip6_output.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 58f6288e9ba5..d4a31becbd25 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -597,7 +597,10 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, int ptr, offset = 0, err = 0; u8 *prevhdr, nexthdr = 0; - hlen = ip6_find_1stfragopt(skb, &prevhdr); + err = ip6_find_1stfragopt(skb, &prevhdr); + if (err < 0) + goto fail; + hlen = err; nexthdr = *prevhdr; mtu = ip6_skb_dst_mtu(skb); |