summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorOliver Hartkopp <socketcan@hartkopp.net>2015-02-23 20:37:54 +0100
committerZefan Li <lizefan@huawei.com>2015-06-19 11:40:23 +0800
commit2932a0a1abaaab014a5698c26dc95956618b4286 (patch)
treea0ee321f78e23c3f5b1f98752adf93fa7cc4adaf /net
parent1c45b5d6a53edcadc1f600a93d8775b78f4e3b8f (diff)
downloadlwn-2932a0a1abaaab014a5698c26dc95956618b4286.tar.gz
lwn-2932a0a1abaaab014a5698c26dc95956618b4286.zip
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> [lizf: Backported to 3.4: - adjust context - drop changes to alloc_canfd_skb(), as there's no such function] Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'net')
-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 0ce2ad0696da..7d9dff2227d1 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -244,6 +244,9 @@ int can_send(struct sk_buff *skb, int loop)
}
skb->protocol = htons(ETH_P_CAN);
+ skb->ip_summed = CHECKSUM_UNNECESSARY;
+
+ skb_reset_mac_header(skb);
skb_reset_network_header(skb);
skb_reset_transport_header(skb);