can: af_can: canfd_rcv(): replace WARN_ONCE by pr_warn_once (d4689846) · Commits · 戴 / test

If an invalid CANFD frame is received, from a driver or from a tun interface, a Kernel warning is generated. This patch replaces the WARN_ONCE by a simple pr_warn_once, so that a kernel, bootet with panic_on_warn, does not panic. A printk seems to be more appropriate here. Reported-by:

<syzbot+e3b775f40babeff6e68b@syzkaller.appspotmail.com> Suggested-by:

Dmitry Vyukov <dvyukov@google.com> Acked-by:

Oliver Hartkopp <socketcan@hartkopp.net> Cc: linux-stable <stable@vger.kernel.org> Signed-off-by:

Marc Kleine-Budde <mkl@pengutronix.de>

net/can/af_can.c

+7 −11

Original line number	Diff line number	Diff line
		@@ -738,20 +738,16 @@ static int canfd_rcv(struct sk_buff skb, struct net_device dev,
		{
		struct canfd_frame cfd = (struct canfd_frame )skb->data;

		if (WARN_ONCE(dev->type != ARPHRD_CAN \|\|
		skb->len != CANFD_MTU \|\|
		cfd->len > CANFD_MAX_DLEN,
		"PF_CAN: dropped non conform CAN FD skbuf: "
		"dev type %d, len %d, datalen %d\n",
		dev->type, skb->len, cfd->len))
		goto drop;
		if (unlikely(dev->type != ARPHRD_CAN \|\| skb->len != CANFD_MTU \|\|
		cfd->len > CANFD_MAX_DLEN)) {
		pr_warn_once("PF_CAN: dropped non conform CAN FD skbuf: dev type %d, len %d, datalen %d\n",
		dev->type, skb->len, cfd->len);
		kfree_skb(skb);
		return NET_RX_DROP;
		}

		can_receive(skb, dev);
		return NET_RX_SUCCESS;

		drop:
		kfree_skb(skb);
		return NET_RX_DROP;
		}

		/*

Admin message