Skip to content

Commit

Permalink
can: add missing initialisations in CAN related skbuffs
Browse files Browse the repository at this point in the history
[ Upstream commit 9694390 ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
  • Loading branch information
hartkopp authored and sashalevin committed Mar 28, 2015
1 parent 24cc23d commit 9baee04
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/net/can/dev.c
Expand Up @@ -500,6 +500,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;

Expand All @@ -524,6 +528,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;

Expand Down
3 changes: 3 additions & 0 deletions net/can/af_can.c
Expand Up @@ -262,6 +262,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);

Expand Down

0 comments on commit 9baee04

Please sign in to comment.