From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793213311; b=BIyFwNEJdB0hl13vDi9YGjLigKtZws94GXAfMvd3XQQhBudYlByqBth/VBkmZZWxqI08 q9bPbSxaimxCY9EQA2qX/m/28+SD9zrKoyvlu43tdcsxU85836Pec6pIoS7fg54JPgbsA 59vShZ+P9fhK6GdJGWsE9iP9iv/1VxrShIaOQJ2eWJmDJxBKmG+NbCl41kBFrBdbTPqbp Zvs6t9lraB9l4szo8S9hSHDNYFGk+wVmTwLKTobgDUKKghuy8M2o48hEyTAOLb/C7iGuo IdNfqIzdXomEIJaAPAttxuIvm8ZiPXKBP63kPOW89zFpGl7VsQOTycJ3jxSjCoNgMmg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793213311; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=IoTUIY5dg6MvZR48Q4TXtbz5A52CcwG74KIgychgQYo=; b=wLSncui8NibsVFYZ1PJhnV4wicsyqqmEKh5wJvEyUiJe5UKeTnvf7DpMaqjo+oDLzMkq TcF0Cxjg2yU+G0FNFhQsGOsbnBR0r67tZ7J8rCuCxbMzGrPp5WvXlGU+5eaTsobmFcMlE MzWL/qWnxYG+O+6Nnv2GWF6rJsG6/wdael6NcX9SLzRgLA6njNOCTUfnoM6xbv5aSB5IT 3s7wh2iNn7rBmhq7Fu2TfZ+ZTLp9gZIlOPPVheG/uPyWctvAKMF5/ExBceTwzRwII3Fqy dyOwzdS6v3cG1bBluYqyEZ0FBpq3nqkN/5g8b/iJWOhxwuT0NrsHE8kv9v4DVinjZXQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=uXLwmirq; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D5E8606A31A; Wed, 28 Oct 2026 18:48:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=uXLwmirq Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF2581F01825; Wed, 28 Oct 2026 18:48:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793213311; bh=IoTUIY5dg6MvZR48Q4TXtbz5A52CcwG74KIgychgQYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=uXLwmirqfW7RI0Q375WzIfWk+H8sg4ZLHzGXUkDignm6lLiY863Irw8q6dwqXjYFl EKS20KruJbCNeF8HzTjq6a60ATST7Q5xFNk3rkFThnNCFc6QM3ETRdxR5rNTrIOaP4 qgk8mQrnD0M7gIQlBTIkassJEQdDQn/63fTGhN1s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Quchaosheng , Willem de Bruijn , Jakub Kicinski Subject: [PATCH 6.1 0461/1887] net/packet: guard the ll header push in packet_rcv_spkt() Date: Wed, 28 Oct 2026 17:42:37 +0100 Message-ID: <20261028170509.725354628@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170459.200466217@linuxfoundation.org> References: <20261028170459.200466217@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Quchaosheng commit 28bc1ef699610ee09ce3d46a00552f5a0a0144bd upstream. packet_rcv_spkt() restores the link layer header with skb_push(skb, skb->data - skb_mac_header(skb)); That subtraction is only meaningful when the device actually has a link layer header. packet_rcv() and tpacket_rcv() both wrap it in dev_has_header(), which is also the predicate the block comment at the top of the file states the restore in terms of; packet_rcv_spkt() does not. commit d549699048b4 ("net/packet: fix packet receive on L3 devices without visible hard header") introduced the helper and changed the two call sites, and this one stayed behind. A device without a visible ll header can leave skb->mac_header at the 0xFFFF sentinel that __alloc_skb() initialises it to. A CAN skb does: init_can_skb() sets pkt_type and ip_summed but does not reset the headers, and commit 9f10374bb024 ("can: remove private CAN skb headroom infrastructure") dropped the skb_reset_*_header() calls that used to be there. skb_mac_header() is then 0xFFFF, the length becomes a large negative number and skb_push() reports it through skb_under_panic() -- from softirq context, so it is a full system panic even with panic_on_oops=0: skbuff: skb_under_panic: text:ffffffff8bd21bc1 len:-65455 put:-65471 head:... data:... tail:0x50 end:0x180 dev:can0 kernel BUG at net/core/skbuff.c:214! RIP: 0010:skb_panic+0x50/0x60 Call Trace: skb_push+0x38/0x40 packet_rcv_spkt+0xe1/0x170 __netif_receive_skb_core.constprop.0+0x7e8/0xd30 ... Kernel panic - not syncing: Fatal exception in interrupt The socket type is reachable: packet_create() accepts SOCK_PACKET alongside SOCK_RAW and SOCK_DGRAM behind the same CAP_NET_RAW check, and neither the socket length nor a capability check keeps it away from a CAN interface. The missing skb_reset_*_header() calls in init_can_skb() are a regression in their own right and are being fixed separately, but a packet socket should not turn a link layer that did not initialise its mac header into a kernel panic. Guard the push the way the other two receive paths do. Tested on v7.3-rc5 under QEMU with a slcan device on a pty, which is the driver RX path: vcan does not reproduce it, because can_send() resets the headers on the way out. One SOCK_PACKET socket bound to can0 and one frame written into the line discipline panics an unpatched kernel with the trace above; the same image with this patch prints no panic and powers off normally. Both kernels are this tree, defconfig plus CONFIG_CAN_SLCAN=y, differing only in this hunk. Fixes: d549699048b4 ("net/packet: fix packet receive on L3 devices without visible hard header") Cc: stable@vger.kernel.org Signed-off-by: Quchaosheng Reviewed-by: Willem de Bruijn Link: https://patch.msgid.link/20260928113108.2127215-1-quchaosheng000406@163.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/packet/af_packet.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c @@ -1964,7 +1964,8 @@ static int packet_rcv_spkt(struct sk_buf spkt = &PACKET_SKB_CB(skb)->sa.pkt; - skb_push(skb, skb->data - skb_mac_header(skb)); + if (dev_has_header(dev)) + skb_push(skb, skb->data - skb_mac_header(skb)); /* * The SOCK_PACKET socket receives _all_ frames.