* [PATCH] can: pch_can: pch_can_rx_normal: fix use after free
@ 2021-11-23 11:16 Vincent Mailhol
0 siblings, 0 replies; 3+ messages in thread
From: Vincent Mailhol @ 2021-11-23 11:16 UTC (permalink / raw)
To: Marc Kleine-Budde, linux-can; +Cc: netdev, linux-kernel, Vincent Mailhol
After calling netif_receive_skb(skb), dereferencing skb is unsafe.
Especially, the can_frame cf which aliases skb memory is dereferenced
just after the call netif_receive_skb(skb).
Reordering the lines solves the issue.
Fixes: b21d18b51b31 ("can: Topcliff: Add PCH_CAN driver.")
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
---
drivers/net/can/pch_can.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 92a54a5fd4c5..964c8a09226a 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -692,11 +692,11 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota)
cf->data[i + 1] = data_reg >> 8;
}
- netif_receive_skb(skb);
rcv_pkts++;
stats->rx_packets++;
quota--;
stats->rx_bytes += cf->len;
+ netif_receive_skb(skb);
pch_fifo_thresh(priv, obj_num);
obj_num++;
--
2.32.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] can: pch_can: pch_can_rx_normal: fix use after free
2021-12-11 21:23 Marc Kleine-Budde
@ 2021-12-12 13:19 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2021-12-12 13:19 UTC (permalink / raw)
To: Marc Kleine-Budde; +Cc: stable, Vincent Mailhol
On Sat, Dec 11, 2021 at 10:23:06PM +0100, Marc Kleine-Budde wrote:
> From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
>
> commit 94cddf1e9227a171b27292509d59691819c458db upstream.
>
> After calling netif_receive_skb(skb), dereferencing skb is unsafe.
> Especially, the can_frame cf which aliases skb memory is dereferenced
> just after the call netif_receive_skb(skb).
>
> Reordering the lines solves the issue.
>
> Fixes: b21d18b51b31 ("can: Topcliff: Add PCH_CAN driver.")
> Link: https://lore.kernel.org/all/20211123111654.621610-1-mailhol.vincent@wanadoo.fr
> Cc: stable@vger.kernel.org
> Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> [mkl: backport to v5.10]
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> ---
> Hey Greg,
>
> this is the backport of
> | 94cddf1e9227 ("can: pch_can: pch_can_rx_normal: fix use after free")
> to v5.10
Now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] can: pch_can: pch_can_rx_normal: fix use after free
@ 2021-12-11 21:23 Marc Kleine-Budde
2021-12-12 13:19 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Marc Kleine-Budde @ 2021-12-11 21:23 UTC (permalink / raw)
To: stable; +Cc: Vincent Mailhol, Marc Kleine-Budde
From: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
commit 94cddf1e9227a171b27292509d59691819c458db upstream.
After calling netif_receive_skb(skb), dereferencing skb is unsafe.
Especially, the can_frame cf which aliases skb memory is dereferenced
just after the call netif_receive_skb(skb).
Reordering the lines solves the issue.
Fixes: b21d18b51b31 ("can: Topcliff: Add PCH_CAN driver.")
Link: https://lore.kernel.org/all/20211123111654.621610-1-mailhol.vincent@wanadoo.fr
Cc: stable@vger.kernel.org
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
[mkl: backport to v5.10]
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
Hey Greg,
this is the backport of
| 94cddf1e9227 ("can: pch_can: pch_can_rx_normal: fix use after free")
to v5.10
regards,
Marc
drivers/net/can/pch_can.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index 5c180d2f3c3c..79d9abdcc65a 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -692,11 +692,11 @@ static int pch_can_rx_normal(struct net_device *ndev, u32 obj_num, int quota)
cf->data[i + 1] = data_reg >> 8;
}
- netif_receive_skb(skb);
rcv_pkts++;
stats->rx_packets++;
quota--;
stats->rx_bytes += cf->can_dlc;
+ netif_receive_skb(skb);
pch_fifo_thresh(priv, obj_num);
obj_num++;
--
2.33.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-12-12 13:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-23 11:16 [PATCH] can: pch_can: pch_can_rx_normal: fix use after free Vincent Mailhol
2021-12-11 21:23 Marc Kleine-Budde
2021-12-12 13:19 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.