diff options
| author | Oliver Hartkopp <socketcan@hartkopp.net> | 2015-02-23 20:37:54 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-09 13:14:05 +0200 |
| commit | c05e616077bdfb6bf9903ec45de55dedd03fce81 (patch) | |
| tree | c056eccc128e3a318eccf4beaa749837866b50e0 /drivers | |
| parent | 6be916ce95ab1159dea6e6bc89f465ee758f4e0d (diff) | |
can: add missing initialisations in CAN related skbuffs
commit 969439016d2cf61fef53a973d7e6d2061c3793b1 upstream.
When accessing CAN network interfaces with AF_PACKET sockets e.g. by dhclient
this can lead to a skb_under_panic due to missing skb initialisations.
Add the missing initialisations at the CAN skbuff creation times on driver
level (rx path) and in the network layer (tx path).
Reported-by: Austin Schuh <austin@peloton-tech.com>
Reported-by: Daniel Steer <daniel.steer@mclaren.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/can/dev.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index a4694aa20a3e..f66aeb79abdf 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -503,6 +503,14 @@ struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf) skb->pkt_type = PACKET_BROADCAST; skb->ip_summed = CHECKSUM_UNNECESSARY; + skb_reset_mac_header(skb); + skb_reset_network_header(skb); + skb_reset_transport_header(skb); + + skb_reset_mac_header(skb); + skb_reset_network_header(skb); + skb_reset_transport_header(skb); + can_skb_reserve(skb); can_skb_prv(skb)->ifindex = dev->ifindex; |