diff options
| author | Jason A. Donenfeld | 2016-10-21 11:28:25 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-10-23 23:38:58 +0200 |
| commit | b678aa578c9e400429e027269e8de2783e5e73ce (patch) | |
| tree | c1dd6a3119b327b4cdf94aed4feadee7721d5a79 /net/ipv6/reassembly.c | |
| parent | bnx2x: Use the correct divisor value for PHC clock readings. (diff) | |
| download | kernel-qcow2-linux-b678aa578c9e400429e027269e8de2783e5e73ce.tar.gz kernel-qcow2-linux-b678aa578c9e400429e027269e8de2783e5e73ce.tar.xz kernel-qcow2-linux-b678aa578c9e400429e027269e8de2783e5e73ce.zip | |
ipv6: do not increment mac header when it's unset
Otherwise we'll overflow the integer. This occurs when layer 3 tunneled
packets are handed off to the IPv6 layer.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/reassembly.c')
| -rw-r--r-- | net/ipv6/reassembly.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 2160d5d009cb..3815e8505ed2 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c @@ -456,7 +456,8 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev, skb_network_header(head)[nhoff] = skb_transport_header(head)[0]; memmove(head->head + sizeof(struct frag_hdr), head->head, (head->data - head->head) - sizeof(struct frag_hdr)); - head->mac_header += sizeof(struct frag_hdr); + if (skb_mac_header_was_set(head)) + head->mac_header += sizeof(struct frag_hdr); head->network_header += sizeof(struct frag_hdr); skb_reset_transport_header(head); |