Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

can: af_can: fix NULL pointer dereference in can_rcv_filter

Analogue to commit 8aa59e355949 ("can: af_can: fix NULL pointer
dereference in can_rx_register()") we need to check for a missing
initialization of ml_priv in the receive path of CAN frames.

Since commit 4e096a18867a ("net: introduce CAN specific pointer in the
struct net_device") the check for dev->type to be ARPHRD_CAN is not
sufficient anymore since bonding or tun netdevices claim to be CAN
devices but do not initialize ml_priv accordingly.

Fixes: 4e096a18867a ("net: introduce CAN specific pointer in the struct net_device")
Reported-by: syzbot+2d7f58292cb5b29eb5ad@syzkaller.appspotmail.com
Reported-by: Wei Chen <harperchen1110@gmail.com>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/all/20221206201259.3028-1-socketcan@hartkopp.net
Cc: stable@vger.kernel.org
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

authored by

Oliver Hartkopp and committed by
Marc Kleine-Budde
0acc4423 1799c1b8

+3 -3
+3 -3
net/can/af_can.c
··· 677 677 static int can_rcv(struct sk_buff *skb, struct net_device *dev, 678 678 struct packet_type *pt, struct net_device *orig_dev) 679 679 { 680 - if (unlikely(dev->type != ARPHRD_CAN || (!can_is_can_skb(skb)))) { 680 + if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_can_skb(skb))) { 681 681 pr_warn_once("PF_CAN: dropped non conform CAN skbuff: dev type %d, len %d\n", 682 682 dev->type, skb->len); 683 683 ··· 692 692 static int canfd_rcv(struct sk_buff *skb, struct net_device *dev, 693 693 struct packet_type *pt, struct net_device *orig_dev) 694 694 { 695 - if (unlikely(dev->type != ARPHRD_CAN || (!can_is_canfd_skb(skb)))) { 695 + if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_canfd_skb(skb))) { 696 696 pr_warn_once("PF_CAN: dropped non conform CAN FD skbuff: dev type %d, len %d\n", 697 697 dev->type, skb->len); 698 698 ··· 707 707 static int canxl_rcv(struct sk_buff *skb, struct net_device *dev, 708 708 struct packet_type *pt, struct net_device *orig_dev) 709 709 { 710 - if (unlikely(dev->type != ARPHRD_CAN || (!can_is_canxl_skb(skb)))) { 710 + if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_canxl_skb(skb))) { 711 711 pr_warn_once("PF_CAN: dropped non conform CAN XL skbuff: dev type %d, len %d\n", 712 712 dev->type, skb->len); 713 713