Commit 2b014503 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-fixes-for-6.1-20221107' of... 

Merge tag 'linux-can-fixes-for-6.1-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can

Marc Kleine-Budde says:

====================
can 2022-11-07

The first patch is by Chen Zhongjin and adds a missing
dev_remove_pack() to the AF_CAN protocol.

Zhengchao Shao's patch fixes a potential NULL pointer deref in
AF_CAN's can_rx_register().

The next patch is by Oliver Hartkopp and targets the CAN ISO-TP
protocol, and fixes the state handling for echo TX processing.

Oliver Hartkopp's patch for the j1939 protocol adds a missing
initialization of the CAN headers inside outgoing skbs.

Another patch by Oliver Hartkopp fixes an out of bounds read in the
check for invalid CAN frames in the xmit callback of virtual CAN
devices. This touches all non virtual device drivers as we decided to
rename the function requiring that netdev_priv points to a struct
can_priv.
(Note: This patch will create a merge conflict with net-next where the
 pch_can driver has removed.)

The last patch is by Geert Uytterhoeven and adds the missing ECC error
checks for the channels 2-7 in the rcar_canfd driver.

* tag 'linux-can-fixes-for-6.1-20221107' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: rcar_canfd: Add missing ECC error checks for channels 2-7
  can: dev: fix skb drop check
  can: j1939: j1939_send_one(): fix missing CAN header initialization
  can: isotp: fix tx state handling for echo tx processing
  can: af_can: fix NULL pointer dereference in can_rx_register()
  can: af_can: can_exit(): add missing dev_remove_pack() of canxl_packet
====================

Link: https://lore.kernel.org/r/20221107133217.59861-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents ce9e57fe 8b043dfb

drivers/net/can/at91_can.c

+1 −1
Original line number Diff line number Diff line
@@ -452,7 +452,7 @@ static netdev_tx_t at91_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	unsigned int mb, prio;

	u32 reg_mid, reg_mcr;



	if (can_dropped_invalid_skb(dev, skb))

	if (can_dev_dropped_skb(dev, skb))

		return NETDEV_TX_OK;



	mb = get_tx_next_mb(priv);

drivers/net/can/c_can/c_can_main.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static netdev_tx_t c_can_start_xmit(struct sk_buff *skb, 
	struct c_can_tx_ring *tx_ring = &priv->tx;

	u32 idx, obj, cmd = IF_COMM_TX;



	if (can_dropped_invalid_skb(dev, skb))

	if (can_dev_dropped_skb(dev, skb))

		return NETDEV_TX_OK;



	if (c_can_tx_busy(priv, tx_ring))

drivers/net/can/can327.c

+1 −1
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ static netdev_tx_t can327_netdev_start_xmit(struct sk_buff *skb, 
	struct can327 *elm = netdev_priv(dev);

	struct can_frame *frame = (struct can_frame *)skb->data;



	if (can_dropped_invalid_skb(dev, skb))

	if (can_dev_dropped_skb(dev, skb))

		return NETDEV_TX_OK;



	/* We shouldn't get here after a hardware fault:

drivers/net/can/cc770/cc770.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static netdev_tx_t cc770_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	struct cc770_priv *priv = netdev_priv(dev);

	unsigned int mo = obj2msgobj(CC770_OBJ_TX);



	if (can_dropped_invalid_skb(dev, skb))

	if (can_dev_dropped_skb(dev, skb))

		return NETDEV_TX_OK;



	netif_stop_queue(dev);

drivers/net/can/ctucanfd/ctucanfd_base.c

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ static netdev_tx_t ctucan_start_xmit(struct sk_buff *skb, struct net_device *nde 
	bool ok;

	unsigned long flags;



	if (can_dropped_invalid_skb(ndev, skb))

	if (can_dev_dropped_skb(ndev, skb))

		return NETDEV_TX_OK;



	if (unlikely(!CTU_CAN_FD_TXTNF(priv))) {