summaryrefslogtreecommitdiffstats
path: root/net/can
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2015-02-23 20:37:54 +0100
committerMarc Kleine-Budde <mkl@pengutronix.de>2015-03-09 10:22:24 +0100
commit969439016d2cf61fef53a973d7e6d2061c3793b1 (patch)
tree8320e446b2b0f31fd6ca77351ba6ba7b2f05d587 /net/can
parentip: fix error queue empty skb handling (diff)
downloadlinux-969439016d2cf61fef53a973d7e6d2061c3793b1.tar.xz
linux-969439016d2cf61fef53a973d7e6d2061c3793b1.zip
can: add missing initialisations in CAN related skbuffs
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> Cc: linux-stable <stable@vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net/can')
-rw-r--r--net/can/af_can.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 66e08040ced7..32d710eaf1fc 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -259,6 +259,9 @@ int can_send(struct sk_buff *skb, int loop)
goto inval_skb;
}
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+ skb_reset_mac_header(skb);
skb_reset_network_header(skb);
skb_reset_transport_header(skb);