lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0081/1017] can: m_can: m_can_tx_handler(): fix use after free of skb
    Date
    From: Marc Kleine-Budde <mkl@pengutronix.de>

    commit 2e8e79c416aae1de224c0f1860f2e3350fa171f8 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: 80646733f11c ("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>
    ---
    drivers/net/can/m_can/m_can.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/net/can/m_can/m_can.c
    +++ b/drivers/net/can/m_can/m_can.c
    @@ -1633,8 +1633,6 @@ static netdev_tx_t m_can_tx_handler(stru
    if (err)
    goto out_fail;

    - can_put_echo_skb(skb, dev, 0, 0);
    -
    if (cdev->can.ctrlmode & CAN_CTRLMODE_FD) {
    cccr = m_can_read(cdev, M_CAN_CCCR);
    cccr &= ~CCCR_CMR_MASK;
    @@ -1651,6 +1649,9 @@ static netdev_tx_t m_can_tx_handler(stru
    m_can_write(cdev, M_CAN_CCCR, cccr);
    }
    m_can_write(cdev, M_CAN_TXBTIE, 0x1);
    +
    + can_put_echo_skb(skb, dev, 0, 0);
    +
    m_can_write(cdev, M_CAN_TXBAR, 0x1);
    /* End of xmit function for version 3.0.x */
    } else {

    \
     
     \ /
      Last update: 2022-04-05 14:08    [W:2.211 / U:1.488 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site