Merge tag 'linux-can-fixes-for-5.16-20211207' of...
Merge tag 'linux-can-fixes-for-5.16-20211207' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can Marc Kleine-Budde says: ==================== can 2021-12-07 The 1st patch is by Vincent Mailhol and fixes a use after free in the pch_can driver. Dan Carpenter fixes a use after free in the ems_pcmcia sja1000 driver. The remaining 7 patches target the m_can driver. Brian Silverman contributes a patch to disable and ignore the ELO interrupt, which is currently not handled in the driver and may lead to an interrupt storm. Vincent Mailhol's patch fixes a memory leak in the error path of the m_can_read_fifo() function. The remaining patches are contributed by Matthias Schiffer, first a iomap_read_fifo() and iomap_write_fifo() functions are fixed in the PCI glue driver, then the clock rate for the Intel Ekhart Lake platform is fixed, the last 3 patches add support for the custom bit timings on the Elkhart Lake platform. * tag 'linux-can-fixes-for-5.16-20211207' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can: can: m_can: pci: use custom bit timings for Elkhart Lake can: m_can: make custom bittiming fields const Revert "can: m_can: remove support for custom bit timing" can: m_can: pci: fix incorrect reference clock rate can: m_can: pci: fix iomap_read_fifo() and iomap_write_fifo() can: m_can: m_can_read_fifo: fix memory leak in error branch can: m_can: Disable and ignore ELO interrupt can: sja1000: fix use after free in ems_pcmcia_add_card() can: pch_can: pch_can_rx_normal: fix use after free ==================== Link: https://lore.kernel.org/r/20211207102420.120131-1-mkl@pengutronix.de Signed-off-by:Jakub Kicinski <kuba@kernel.org>
Showing
- drivers/net/can/m_can/m_can.c 27 additions, 15 deletionsdrivers/net/can/m_can/m_can.c
- drivers/net/can/m_can/m_can.h 3 additions, 0 deletionsdrivers/net/can/m_can/m_can.h
- drivers/net/can/m_can/m_can_pci.c 56 additions, 6 deletionsdrivers/net/can/m_can/m_can_pci.c
- drivers/net/can/pch_can.c 1 addition, 1 deletiondrivers/net/can/pch_can.c
- drivers/net/can/sja1000/ems_pcmcia.c 6 additions, 1 deletiondrivers/net/can/sja1000/ems_pcmcia.c
Please register or sign in to comment