lkml.org 
[lkml]   [2018]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 102/118] can: kvaser_usb: Fix potential uninitialized variable use
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jimmy Assarsson <jimmyassarsson@gmail.com>

    commit 95217260649aa504eb5d4a0d50959ca4e67c8f96 upstream.

    If alloc_can_err_skb() fails, cf is never initialized.
    Move assignment of cf inside check.

    Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Jimmy Assarsson <jimmyassarsson@gmail.com>
    Cc: linux-stable <stable@vger.kernel.org>
    Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 10 +++++-----
    1 file changed, 5 insertions(+), 5 deletions(-)

    --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
    +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
    @@ -1019,6 +1019,11 @@ kvaser_usb_hydra_error_frame(struct kvas
    new_state : CAN_STATE_ERROR_ACTIVE;

    can_change_state(netdev, cf, tx_state, rx_state);
    +
    + if (priv->can.restart_ms &&
    + old_state >= CAN_STATE_BUS_OFF &&
    + new_state < CAN_STATE_BUS_OFF)
    + cf->can_id |= CAN_ERR_RESTARTED;
    }

    if (new_state == CAN_STATE_BUS_OFF) {
    @@ -1028,11 +1033,6 @@ kvaser_usb_hydra_error_frame(struct kvas

    can_bus_off(netdev);
    }
    -
    - if (priv->can.restart_ms &&
    - old_state >= CAN_STATE_BUS_OFF &&
    - new_state < CAN_STATE_BUS_OFF)
    - cf->can_id |= CAN_ERR_RESTARTED;
    }

    if (!skb) {

    \
     
     \ /
      Last update: 2018-11-26 12:08    [W:3.613 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site