From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932789AbbDGXU0 (ORCPT ); Tue, 7 Apr 2015 19:20:26 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:55731 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754441AbbDGWwk (ORCPT ); Tue, 7 Apr 2015 18:52:40 -0400 From: Kamal Mostafa To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Oliver Hartkopp , Marc Kleine-Budde , Kamal Mostafa Subject: [PATCH 3.13.y-ckt 071/156] can: add missing initialisations in CAN related skbuffs Date: Tue, 7 Apr 2015 15:50:08 -0700 Message-Id: <1428447093-3282-72-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428447093-3282-1-git-send-email-kamal@canonical.com> References: <1428447093-3282-1-git-send-email-kamal@canonical.com> X-Extended-Stable: 3.13 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.13.11-ckt19 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Oliver Hartkopp 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 Reported-by: Daniel Steer Signed-off-by: Oliver Hartkopp Signed-off-by: Marc Kleine-Budde [ kamal: backport to 3.13-stable: no alloc_canfd_skb() in 3.13 ] Signed-off-by: Kamal Mostafa --- drivers/net/can/dev.c | 4 ++++ net/can/af_can.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index c8f55ae..3230ac8 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -503,6 +503,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; diff --git a/net/can/af_can.c b/net/can/af_can.c index a27f8aa..5e9a227 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c @@ -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); -- 1.9.1