aboutsummaryrefslogtreecommitdiff
path: root/net/packet
diff options
context:
space:
mode:
authorWillem de Bruijn <willemb@google.com>2018-07-11 12:00:45 -0400
committerDavid S. Miller <davem@davemloft.net>2018-07-12 16:55:59 -0700
commit993675a3100b16a4c80dfd70cbcde8ea7127b31d (patch)
treefeef4c1e7ca426c40bdbc1da1f745ee938b13eb3 /net/packet
parentbab2c80e5a6c855657482eac9e97f5f3eedb509a (diff)
downloadlinux-stericsson-993675a3100b16a4c80dfd70cbcde8ea7127b31d.tar.gz
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')
-rw-r--r--net/packet/af_packet.c2
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 */