Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cb68751 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: af_can: can_rcv(): replace WARN_ONCE by pr_warn_once 



If an invalid CAN 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: default avatar <syzbot+4386709c0c1284dca827@syzkaller.appspotmail.com>
Suggested-by: default avatarDmitry Vyukov <dvyukov@google.com>
Acked-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent ad9294db

net/can/af_can.c

+7 −11
Original line number Diff line number Diff line
@@ -721,20 +721,16 @@ static int can_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 != CAN_MTU ||

		      cfd->len > CAN_MAX_DLEN,

		      "PF_CAN: dropped non conform CAN 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 != CAN_MTU ||

		     cfd->len > CAN_MAX_DLEN)) {

		pr_warn_once("PF_CAN: dropped non conform CAN 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;

}



static int canfd_rcv(struct sk_buff *skb, struct net_device *dev,