diff options
| author |   Willem de Bruijn <willemb@google.com> | 2018-07-11 12:00:45 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-07-12 16:55:59 -0700 |
| commit | 993675a3100b16a4c80dfd70cbcde8ea7127b31d (patch) | |
| tree | feef4c1e7ca426c40bdbc1da1f745ee938b13eb3 /net/packet/af_packet.c | |
| parent | nsh: set mac len based on inner packet (diff) | |
| download | linux-dev-993675a3100b16a4c80dfd70cbcde8ea7127b31d.tar.xz linux-dev-993675a3100b16a4c80dfd70cbcde8ea7127b31d.zip | |
packet: reset network header if packet shorter than ll reserved space
If variable length link layer headers result in a packet shorter
than dev->hard_header_len, reset the network header offset. Else
skb->mac_len may exceed skb->len after skb_mac_reset_len.
packet_sendmsg_spkt already has similar logic.
Fixes: b84bbaf7a6c8 ("packet: in packet_snd start writing at link layer allocation")
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/packet/af_packet.c')
| -rw-r--r-- | net/packet/af_packet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 57634bc3da74..9b27d0cd766d 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -2878,6 +2878,8 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) goto out_free; } else if (reserve) { skb_reserve(skb, -reserve); + if (len < reserve) + skb_reset_network_header(skb); } /* Returns -EFAULT on error */ |