Merge tag 'linux-can-fixes-for-5.10-20201115' of... (e2142ef2) · Commits · 戴 / test

Merge tag 'linux-can-fixes-for-5.10-20201115' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can Marc Kleine-Budde says: ==================== pull-request: can 2020-11-15 Anant Thazhemadam contributed two patches for the AF_CAN that prevent potential access of uninitialized member in can_rcv() and canfd_rcv(). The next patch is by Alejandro Concepcion Rodriguez and changes can_restart() to use the correct function to push a skb into the networking stack from process context. Zhang Qilong's patch fixes a memory leak in the error path of the ti_hecc's probe function. A patch by me fixes mcba_usb_start_xmit() function in the mcba_usb driver, to first fill the skb and then pass it to can_put_echo_skb(). Colin Ian King's patch fixes a potential integer overflow on shift in the peak_usb driver. The next two patches target the flexcan driver, a patch by me adds the missing "req_bit" to the stop mode property comment (which was broken during net-next for v5.10). Zhang Qilong's patch fixes the failure handling of pm_runtime_get_sync(). The next seven patches target the m_can driver including the tcan4x5x spi driver glue code. Enric Balletbo i Serra's patch for the tcan4x5x Kconfig fix the REGMAP_SPI dependency handling. A patch by me for the tcan4x5x driver's probe() function adds missing error handling to for devm_regmap_init(), and in tcan4x5x_can_remove() the order of deregistration is fixed. Wu Bo's patch for the m_can driver fixes the state change handling in m_can_handle_state_change(). Two patches by Dan Murphy first introduce m_can_class_free_dev() and then make use of it to fix the freeing of the can device. A patch by Faiz Abbas add a missing shutdown of the CAN controller in the m_can_stop() function. * tag 'linux-can-fixes-for-5.10-20201115' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can: can: m_can: m_can_stop(): set device to software init mode before closing can: m_can: Fix freeing of can device from peripherials can: m_can: m_can_class_free_dev(): introduce new function can: m_can: m_can_handle_state_change(): fix state change can: tcan4x5x: tcan4x5x_can_remove(): fix order of deregistration can: tcan4x5x: tcan4x5x_can_probe(): add missing error checking for devm_regmap_init() can: tcan4x5x: replace depends on REGMAP_SPI with depends on SPI can: flexcan: fix failure handling of pm_runtime_get_sync() can: flexcan: flexcan_setup_stop_mode(): add missing "req_bit" to stop mode property comment can: peak_usb: fix potential integer overflow on shift of a int can: mcba_usb: mcba_usb_start_xmit(): first fill skb, then pass to can_put_echo_skb() can: ti_hecc: Fix memleak in ti_hecc_probe can: dev: can_restart(): post buffer from the right context can: af_can: prevent potential access of uninitialized member in canfd_rcv() can: af_can: prevent potential access of uninitialized member in can_rcv() ==================== Link: https://lore.kernel.org/r/20201115174131.2089251-1-mkl@pengutronix.de Signed-off-by:

Jakub Kicinski <kuba@kernel.org>

drivers/net/can/dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -592,7 +592,7 @@ static void can_restart(struct net_device *dev)

		cf->can_id \|= CAN_ERR_RESTARTED;

		netif_rx(skb);
		netif_rx_ni(skb);

		stats->rx_packets++;
		stats->rx_bytes += cf->can_dlc;

drivers/net/can/flexcan.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -728,8 +728,10 @@ static int flexcan_get_berr_counter(const struct net_device *dev,
		int err;

		err = pm_runtime_get_sync(priv->dev);
		if (err < 0)
		if (err < 0) {
		pm_runtime_put_noidle(priv->dev);
		return err;
		}

		err = __flexcan_get_berr_counter(dev, bec);

		@@ -1654,8 +1656,10 @@ static int flexcan_open(struct net_device *dev)
		}

		err = pm_runtime_get_sync(priv->dev);
		if (err < 0)
		if (err < 0) {
		pm_runtime_put_noidle(priv->dev);
		return err;
		}

		err = open_candev(dev);
		if (err)
		@@ -1852,7 +1856,7 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev)
		return -EINVAL;

		/* stop mode property format is:
		* <&gpr req_gpr>.
		* <&gpr req_gpr req_bit>.
		*/
		ret = of_property_read_u32_array(np, "fsl,stop-mode", out_val,
		ARRAY_SIZE(out_val));

drivers/net/can/m_can/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,8 @@ config CAN_M_CAN_PLATFORM

		config CAN_M_CAN_TCAN4X5X
		depends on CAN_M_CAN
		depends on REGMAP_SPI
		depends on SPI
		select REGMAP_SPI
		tristate "TCAN4X5X M_CAN device"
		help
		Say Y here if you want support for Texas Instruments TCAN4x5x

drivers/net/can/m_can/m_can.c

+11 −5

Original line number	Diff line number	Diff line
		@@ -665,7 +665,7 @@ static int m_can_handle_state_change(struct net_device *dev,
		unsigned int ecr;

		switch (new_state) {
		case CAN_STATE_ERROR_ACTIVE:
		case CAN_STATE_ERROR_WARNING:
		/* error warning state */
		cdev->can.can_stats.error_warning++;
		cdev->can.state = CAN_STATE_ERROR_WARNING;
		@@ -694,7 +694,7 @@ static int m_can_handle_state_change(struct net_device *dev,
		__m_can_get_berr_counter(dev, &bec);

		switch (new_state) {
		case CAN_STATE_ERROR_ACTIVE:
		case CAN_STATE_ERROR_WARNING:
		/* error warning state */
		cf->can_id \|= CAN_ERR_CRTL;
		cf->data[1] = (bec.txerr > bec.rxerr) ?
		@@ -1414,6 +1414,9 @@ static void m_can_stop(struct net_device *dev)
		/* disable all interrupts */
		m_can_disable_all_interrupts(cdev);

		/* Set init mode to disengage from the network */
		m_can_config_endisable(cdev, true);

		/* set the state as STOPPED */
		cdev->can.state = CAN_STATE_STOPPED;
		}
		@@ -1812,6 +1815,12 @@ out:
		}
		EXPORT_SYMBOL_GPL(m_can_class_allocate_dev);

		void m_can_class_free_dev(struct net_device *net)
		{
		free_candev(net);
		}
		EXPORT_SYMBOL_GPL(m_can_class_free_dev);

		int m_can_class_register(struct m_can_classdev *m_can_dev)
		{
		int ret;
		@@ -1850,7 +1859,6 @@ pm_runtime_fail:
		if (ret) {
		if (m_can_dev->pm_clock_support)
		pm_runtime_disable(m_can_dev->dev);
		free_candev(m_can_dev->net);
		}

		return ret;
		@@ -1908,8 +1916,6 @@ void m_can_class_unregister(struct m_can_classdev *m_can_dev)
		unregister_candev(m_can_dev->net);

		m_can_clk_stop(m_can_dev);

		free_candev(m_can_dev->net);
		}
		EXPORT_SYMBOL_GPL(m_can_class_unregister);

drivers/net/can/m_can/m_can.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ struct m_can_classdev {
		};

		struct m_can_classdev m_can_class_allocate_dev(struct device dev);
		void m_can_class_free_dev(struct net_device *net);
		int m_can_class_register(struct m_can_classdev *cdev);
		void m_can_class_unregister(struct m_can_classdev *cdev);
		int m_can_class_get_clocks(struct m_can_classdev *cdev);

Admin message