* FAILED: patch "[PATCH] can: af_can: fix NULL pointer dereference in can_rcv_filter" failed to apply to 4.19-stable tree
@ 2022-12-11 9:53 gregkh
2022-12-12 10:15 ` Oliver Hartkopp
0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2022-12-11 9:53 UTC (permalink / raw)
To: socketcan, harperchen1110, mkl; +Cc: stable
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
Possible dependencies:
0acc442309a0 ("can: af_can: fix NULL pointer dereference in can_rcv_filter")
fb08cba12b52 ("can: canxl: update CAN infrastructure for CAN XL frames")
467ef4c7b9d1 ("can: skb: add skb CAN frame data length helpers")
96a7457a14d9 ("can: skb: unify skb CAN frame identification helpers")
a6d190f8c767 ("can: skb: drop tx skb if in listen only mode")
ccd8a9351f7b ("can: skb: move can_dropped_invalid_skb() and can_skb_headroom_valid() to skb.c")
6a5286442fb6 ("can: Kconfig: turn menu "CAN Device Drivers" into a menuconfig using CAN_DEV")
df6ad5dd838e ("can: Kconfig: rename config symbol CAN_DEV into CAN_NETLINK")
6c1e423a3c84 ("can: can-dev: remove obsolete CAN LED support")
2dcb8e8782d8 ("can: ctucanfd: add support for CTU CAN FD open-source IP core - bus independent part.")
136bed0bfd3b ("can: mcba_usb: properly check endpoint type")
00f4a0afb7ea ("can: Use netif_rx().")
c5048a7b2c23 ("can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready")
1c45f5778a3b ("can: flexcan: add ethtool support to change rx-rtr setting during runtime")
c5c88591040e ("can: flexcan: add more quirks to describe RX path capabilities")
34ea4e1c99f1 ("can: flexcan: rename RX modes")
01bb4dccd92b ("can: flexcan: allow to change quirks at runtime")
bfd00e021cf1 ("can: flexcan: move driver into separate sub directory")
5fe1be81efd2 ("can: dev: reorder struct can_priv members for better packing")
cc4b08c31b5c ("can: do not increase tx_bytes statistics for RTR frames")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 0acc442309a0a1b01bcdaa135e56e6398a49439c Mon Sep 17 00:00:00 2001
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: Tue, 6 Dec 2022 21:12:59 +0100
Subject: [PATCH] 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>
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 27dcdcc0b808..c69168f11e44 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -677,7 +677,7 @@ static void can_receive(struct sk_buff *skb, struct net_device *dev)
static int can_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev)
{
- if (unlikely(dev->type != ARPHRD_CAN || (!can_is_can_skb(skb)))) {
+ if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_can_skb(skb))) {
pr_warn_once("PF_CAN: dropped non conform CAN skbuff: dev type %d, len %d\n",
dev->type, skb->len);
@@ -692,7 +692,7 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev,
static int canfd_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev)
{
- if (unlikely(dev->type != ARPHRD_CAN || (!can_is_canfd_skb(skb)))) {
+ if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_canfd_skb(skb))) {
pr_warn_once("PF_CAN: dropped non conform CAN FD skbuff: dev type %d, len %d\n",
dev->type, skb->len);
@@ -707,7 +707,7 @@ static int canfd_rcv(struct sk_buff *skb, struct net_device *dev,
static int canxl_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev)
{
- if (unlikely(dev->type != ARPHRD_CAN || (!can_is_canxl_skb(skb)))) {
+ if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_canxl_skb(skb))) {
pr_warn_once("PF_CAN: dropped non conform CAN XL skbuff: dev type %d, len %d\n",
dev->type, skb->len);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: FAILED: patch "[PATCH] can: af_can: fix NULL pointer dereference in can_rcv_filter" failed to apply to 4.19-stable tree
2022-12-11 9:53 FAILED: patch "[PATCH] can: af_can: fix NULL pointer dereference in can_rcv_filter" failed to apply to 4.19-stable tree gregkh
@ 2022-12-12 10:15 ` Oliver Hartkopp
2022-12-12 11:55 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Oliver Hartkopp @ 2022-12-12 10:15 UTC (permalink / raw)
To: gregkh, harperchen1110, mkl; +Cc: stable
Just FYI
The longterm kernels before Linux 5.4 (4.9/4.14/4.19) are not affected
by this issue as the netdev->ml_priv pointer is assigned within a netdev
notifier for ARPHRD_CAN interfaces and this always assigns the data
structure properly.
I tested the crash reproducer from the syzbot bug report which did not
have any bad effect (as expected).
Best regards,
Oliver
On 12/11/22 10:53, gregkh@linuxfoundation.org wrote:
>
> The patch below does not apply to the 4.19-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <stable@vger.kernel.org>.
>
> Possible dependencies:
>
> 0acc442309a0 ("can: af_can: fix NULL pointer dereference in can_rcv_filter")
> fb08cba12b52 ("can: canxl: update CAN infrastructure for CAN XL frames")
> 467ef4c7b9d1 ("can: skb: add skb CAN frame data length helpers")
> 96a7457a14d9 ("can: skb: unify skb CAN frame identification helpers")
> a6d190f8c767 ("can: skb: drop tx skb if in listen only mode")
> ccd8a9351f7b ("can: skb: move can_dropped_invalid_skb() and can_skb_headroom_valid() to skb.c")
> 6a5286442fb6 ("can: Kconfig: turn menu "CAN Device Drivers" into a menuconfig using CAN_DEV")
> df6ad5dd838e ("can: Kconfig: rename config symbol CAN_DEV into CAN_NETLINK")
> 6c1e423a3c84 ("can: can-dev: remove obsolete CAN LED support")
> 2dcb8e8782d8 ("can: ctucanfd: add support for CTU CAN FD open-source IP core - bus independent part.")
> 136bed0bfd3b ("can: mcba_usb: properly check endpoint type")
> 00f4a0afb7ea ("can: Use netif_rx().")
> c5048a7b2c23 ("can: rcar_canfd: rcar_canfd_channel_probe(): register the CAN device when fully ready")
> 1c45f5778a3b ("can: flexcan: add ethtool support to change rx-rtr setting during runtime")
> c5c88591040e ("can: flexcan: add more quirks to describe RX path capabilities")
> 34ea4e1c99f1 ("can: flexcan: rename RX modes")
> 01bb4dccd92b ("can: flexcan: allow to change quirks at runtime")
> bfd00e021cf1 ("can: flexcan: move driver into separate sub directory")
> 5fe1be81efd2 ("can: dev: reorder struct can_priv members for better packing")
> cc4b08c31b5c ("can: do not increase tx_bytes statistics for RTR frames")
>
> thanks,
>
> greg k-h
>
> ------------------ original commit in Linus's tree ------------------
>
> From 0acc442309a0a1b01bcdaa135e56e6398a49439c Mon Sep 17 00:00:00 2001
> From: Oliver Hartkopp <socketcan@hartkopp.net>
> Date: Tue, 6 Dec 2022 21:12:59 +0100
> Subject: [PATCH] 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>
>
> diff --git a/net/can/af_can.c b/net/can/af_can.c
> index 27dcdcc0b808..c69168f11e44 100644
> --- a/net/can/af_can.c
> +++ b/net/can/af_can.c
> @@ -677,7 +677,7 @@ static void can_receive(struct sk_buff *skb, struct net_device *dev)
> static int can_rcv(struct sk_buff *skb, struct net_device *dev,
> struct packet_type *pt, struct net_device *orig_dev)
> {
> - if (unlikely(dev->type != ARPHRD_CAN || (!can_is_can_skb(skb)))) {
> + if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_can_skb(skb))) {
> pr_warn_once("PF_CAN: dropped non conform CAN skbuff: dev type %d, len %d\n",
> dev->type, skb->len);
>
> @@ -692,7 +692,7 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev,
> static int canfd_rcv(struct sk_buff *skb, struct net_device *dev,
> struct packet_type *pt, struct net_device *orig_dev)
> {
> - if (unlikely(dev->type != ARPHRD_CAN || (!can_is_canfd_skb(skb)))) {
> + if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_canfd_skb(skb))) {
> pr_warn_once("PF_CAN: dropped non conform CAN FD skbuff: dev type %d, len %d\n",
> dev->type, skb->len);
>
> @@ -707,7 +707,7 @@ static int canfd_rcv(struct sk_buff *skb, struct net_device *dev,
> static int canxl_rcv(struct sk_buff *skb, struct net_device *dev,
> struct packet_type *pt, struct net_device *orig_dev)
> {
> - if (unlikely(dev->type != ARPHRD_CAN || (!can_is_canxl_skb(skb)))) {
> + if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || !can_is_canxl_skb(skb))) {
> pr_warn_once("PF_CAN: dropped non conform CAN XL skbuff: dev type %d, len %d\n",
> dev->type, skb->len);
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: FAILED: patch "[PATCH] can: af_can: fix NULL pointer dereference in can_rcv_filter" failed to apply to 4.19-stable tree
2022-12-12 10:15 ` Oliver Hartkopp
@ 2022-12-12 11:55 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2022-12-12 11:55 UTC (permalink / raw)
To: Oliver Hartkopp; +Cc: harperchen1110, mkl, stable
On Mon, Dec 12, 2022 at 11:15:58AM +0100, Oliver Hartkopp wrote:
> Just FYI
>
> The longterm kernels before Linux 5.4 (4.9/4.14/4.19) are not affected by
> this issue as the netdev->ml_priv pointer is assigned within a netdev
> notifier for ARPHRD_CAN interfaces and this always assigns the data
> structure properly.
>
> I tested the crash reproducer from the syzbot bug report which did not have
> any bad effect (as expected).
Wonderful, thanks for letting us know.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-12 11:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-11 9:53 FAILED: patch "[PATCH] can: af_can: fix NULL pointer dereference in can_rcv_filter" failed to apply to 4.19-stable tree gregkh
2022-12-12 10:15 ` Oliver Hartkopp
2022-12-12 11:55 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox