Commit ccf78f7f authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-fixes-for-6.17-20250910' of... 

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

Marc Kleine-Budde says:

====================
pull-request: can 2025-09-10

The 1st patch is by Alex Tran and fixes the Documentation of the
struct bcm_msg_head.

Davide Caratti's patch enabled the VCAN driver as a module for the
Linux self tests.

Tetsuo Handa contributes 3 patches that fix various problems in the
CAN j1939 protocol.

Anssi Hannula's patch fixes a potential use-after-free in the
xilinx_can driver.

Geert Uytterhoeven's patch fixes the rcan_can's suspend to RAM on
R-Car Gen3 using PSCI.

* tag 'linux-can-fixes-for-6.17-20250910' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can:
  can: rcar_can: rcar_can_resume(): fix s2ram with PSCI
  can: xilinx_can: xcan_write_frame(): fix use-after-free of transmitted SKB
  can: j1939: j1939_local_ecu_get(): undo increment when j1939_local_ecu_get() fails
  can: j1939: j1939_sk_bind(): call j1939_priv_put() immediately when j1939_local_ecu_get() failed
  can: j1939: implement NETDEV_UNREGISTER notification handler
  selftests: can: enable CONFIG_CAN_VCAN as a module
  docs: networking: can: change bcm_msg_head frames member to support flexible array
====================

Link: https://patch.msgid.link/20250910162907.948454-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents a2ddf8a5 5c793afa

Documentation/networking/can.rst

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ The broadcast manager sends responses to user space in the same form: 
            struct timeval ival1, ival2;    /* count and subsequent interval */

            canid_t can_id;                 /* unique can_id for task */

            __u32 nframes;                  /* number of can_frames following */

            struct can_frame frames[0];

            struct can_frame frames[];

    };



The aligned payload 'frames' uses the same basic CAN frame structure defined

drivers/net/can/rcar/rcar_can.c

+1 −7
Original line number Diff line number Diff line
@@ -861,7 +861,6 @@ static int rcar_can_resume(struct device *dev) 
{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct rcar_can_priv *priv = netdev_priv(ndev);

	u16 ctlr;

	int err;



	if (!netif_running(ndev))
@@ -873,12 +872,7 @@ static int rcar_can_resume(struct device *dev) 
		return err;

	}



	ctlr = readw(&priv->regs->ctlr);

	ctlr &= ~RCAR_CAN_CTLR_SLPM;

	writew(ctlr, &priv->regs->ctlr);

	ctlr &= ~RCAR_CAN_CTLR_CANM;

	writew(ctlr, &priv->regs->ctlr);

	priv->can.state = CAN_STATE_ERROR_ACTIVE;

	rcar_can_start(ndev);



	netif_device_attach(ndev);

	netif_start_queue(ndev);

drivers/net/can/xilinx_can.c

+8 −8
Original line number Diff line number Diff line
@@ -690,14 +690,6 @@ static void xcan_write_frame(struct net_device *ndev, struct sk_buff *skb, 
		dlc |= XCAN_DLCR_EDL_MASK;

	}



	if (!(priv->devtype.flags & XCAN_FLAG_TX_MAILBOXES) &&

	    (priv->devtype.flags & XCAN_FLAG_TXFEMP))

		can_put_echo_skb(skb, ndev, priv->tx_head % priv->tx_max, 0);

	else

		can_put_echo_skb(skb, ndev, 0, 0);



	priv->tx_head++;



	priv->write_reg(priv, XCAN_FRAME_ID_OFFSET(frame_offset), id);

	/* If the CAN frame is RTR frame this write triggers transmission

	 * (not on CAN FD)
@@ -730,6 +722,14 @@ static void xcan_write_frame(struct net_device *ndev, struct sk_buff *skb, 
					data[1]);

		}

	}



	if (!(priv->devtype.flags & XCAN_FLAG_TX_MAILBOXES) &&

	    (priv->devtype.flags & XCAN_FLAG_TXFEMP))

		can_put_echo_skb(skb, ndev, priv->tx_head % priv->tx_max, 0);

	else

		can_put_echo_skb(skb, ndev, 0, 0);



	priv->tx_head++;

}



/**

net/can/j1939/bus.c

+4 −1
Original line number Diff line number Diff line
@@ -290,8 +290,11 @@ int j1939_local_ecu_get(struct j1939_priv *priv, name_t name, u8 sa) 
	if (!ecu)

		ecu = j1939_ecu_create_locked(priv, name);

	err = PTR_ERR_OR_ZERO(ecu);

	if (err)

	if (err) {

		if (j1939_address_is_unicast(sa))

			priv->ents[sa].nusers--;

		goto done;

	}



	ecu->nusers++;

	/* TODO: do we care if ecu->addr != sa? */

net/can/j1939/j1939-priv.h

+1 −0
Original line number Diff line number Diff line
@@ -212,6 +212,7 @@ void j1939_priv_get(struct j1939_priv *priv); 


/* notify/alert all j1939 sockets bound to ifindex */

void j1939_sk_netdev_event_netdown(struct j1939_priv *priv);

void j1939_sk_netdev_event_unregister(struct j1939_priv *priv);

int j1939_cancel_active_session(struct j1939_priv *priv, struct sock *sk);

void j1939_tp_init(struct j1939_priv *priv);