can: add missing initialisations in CAN related skbuffs
Subsystems (2)
Oliver Hartkopp
maintainerPATCH 1/1 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 <[email protected]>
Reported-by Daniel Steer <[email protected]>
Signed-off-by Oliver Hartkopp <[email protected]>
--- drivers/net/can/dev.c | 8 ++++++++ net/can/af_can.c | 3 +++ 2 files changed, 11 insertions(+)
drivers/net/can/dev.c +8 -0
@@ -579,6 +579,10 @@ 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); +can_skb_reserve (skb);can_skb_prv (skb)->ifindex = dev->ifindex;
@@ -603,6 +607,10 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev, 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;
net/can/af_can.c +3 -0
@@ -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);
Signature · 1 line
2.1.4
Quoted 9 lines · Oliver Hartkopp
When accessing CAN network interfaces with
AF_PACKETsockets e.g. by dhclient this can lead to askb_under_panicdue 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 <[email protected]>Reported-by Daniel Steer <[email protected]>Signed-off-by Oliver Hartkopp <[email protected]>
Thanks, applied to can/master, added stable on Cc.
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions | Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |