can: m_can: m_can_tx_handler(): fix use after free of skb
commit2e8e79c416
upstream. can_put_echo_skb() will clone skb then free the skb. Move the can_put_echo_skb() for the m_can version 3.0.x directly before the start of the xmit in hardware, similar to the 3.1.x branch. Fixes:80646733f1
("can: m_can: update to support CAN FD features") Link: https://lore.kernel.org/all/20220317081305.739554-1-mkl@pengutronix.de Cc: stable@vger.kernel.org Reported-by: Hangyu Hua <hbh25y@gmail.com> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Родитель
459b19f42f
Коммит
f43e64076f
|
@ -1640,8 +1640,6 @@ static netdev_tx_t m_can_tx_handler(struct m_can_classdev *cdev)
|
||||||
if (err)
|
if (err)
|
||||||
goto out_fail;
|
goto out_fail;
|
||||||
|
|
||||||
can_put_echo_skb(skb, dev, 0, 0);
|
|
||||||
|
|
||||||
if (cdev->can.ctrlmode & CAN_CTRLMODE_FD) {
|
if (cdev->can.ctrlmode & CAN_CTRLMODE_FD) {
|
||||||
cccr = m_can_read(cdev, M_CAN_CCCR);
|
cccr = m_can_read(cdev, M_CAN_CCCR);
|
||||||
cccr &= ~CCCR_CMR_MASK;
|
cccr &= ~CCCR_CMR_MASK;
|
||||||
|
@ -1658,6 +1656,9 @@ static netdev_tx_t m_can_tx_handler(struct m_can_classdev *cdev)
|
||||||
m_can_write(cdev, M_CAN_CCCR, cccr);
|
m_can_write(cdev, M_CAN_CCCR, cccr);
|
||||||
}
|
}
|
||||||
m_can_write(cdev, M_CAN_TXBTIE, 0x1);
|
m_can_write(cdev, M_CAN_TXBTIE, 0x1);
|
||||||
|
|
||||||
|
can_put_echo_skb(skb, dev, 0, 0);
|
||||||
|
|
||||||
m_can_write(cdev, M_CAN_TXBAR, 0x1);
|
m_can_write(cdev, M_CAN_TXBAR, 0x1);
|
||||||
/* End of xmit function for version 3.0.x */
|
/* End of xmit function for version 3.0.x */
|
||||||
} else {
|
} else {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче