can: kvaser_usb: Fix potential uninitialized variable use (95217260) · Commits · 戴 / test

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

Jimmy Assarsson <jimmyassarsson@gmail.com> Cc: linux-stable <stable@vger.kernel.org> Signed-off-by:

drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -1019,6 +1019,11 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv,
		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 kvaser_usb_net_priv *priv,

		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) {