[PATCH 3.19 049/123] can: add missing initialisations in CAN related skbuffs
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: 2015-03-24 17:34:04
Also in:
lkml
3.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver Hartkopp <socketcan@hartkopp.net> 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 <redacted> Reported-by: Daniel Steer <redacted> Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/net/can/dev.c | 8 ++++++++ net/can/af_can.c | 3 +++ 2 files changed, 11 insertions(+)
--- a/drivers/net/can/dev.c
+++ b/drivers/net/can/dev.c@@ -578,6 +578,10 @@ struct sk_buff *alloc_can_skb(struct net 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); + can_skb_reserve(skb); can_skb_prv(skb)->ifindex = dev->ifindex;
@@ -602,6 +606,10 @@ struct sk_buff *alloc_canfd_skb(struct n 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); + can_skb_reserve(skb); can_skb_prv(skb)->ifindex = dev->ifindex; --- a/net/can/af_can.c +++ b/net/can/af_can.c
@@ -259,6 +259,9 @@ int can_send(struct sk_buff *skb, int lo goto inval_skb; } + skb->ip_summed = CHECKSUM_UNNECESSARY; + + skb_reset_mac_header(skb); skb_reset_network_header(skb); skb_reset_transport_header(skb);