Hello Jakub, hello David,
this is a pull request of 5 patches for net/master.
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, targets the j1939 protocol and
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.
regards,
Marc
---
The following changes since commit 91018bbcc664b6c9410ddccacd2239a4acadcfc9:
Merge tag 'wireless-2022-11-03' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless (2022-11-03 21:07:40 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git tags/linux-can-fixes-for-6.1-20221104
for you to fetch changes up to 07d79cb24535b0d801bf5fabe127c054276e2d38:
can: rcar_canfd: Add missing ECC error checks for channels 2-7 (2022-11-04 13:29:29 +0100)
----------------------------------------------------------------
linux-can-fixes-for-6.1-20221104
----------------------------------------------------------------
Chen Zhongjin (1):
can: af_can: can_exit(): add missing dev_remove_pack() of canxl_packet
Geert Uytterhoeven (1):
can: rcar_canfd: Add missing ECC error checks for channels 2-7
Oliver Hartkopp (2):
can: j1939: j1939_send_one(): fix missing CAN header initialization
can: dev: fix skb drop check
Zhengchao Shao (1):
can: af_can: fix NULL pointer dereference in can_rx_register()
drivers/net/can/at91_can.c | 2 +-
drivers/net/can/c_can/c_can_main.c | 2 +-
drivers/net/can/can327.c | 2 +-
drivers/net/can/cc770/cc770.c | 2 +-
drivers/net/can/ctucanfd/ctucanfd_base.c | 2 +-
drivers/net/can/dev/skb.c | 10 +---------
drivers/net/can/flexcan/flexcan-core.c | 2 +-
drivers/net/can/grcan.c | 2 +-
drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +-
drivers/net/can/janz-ican3.c | 2 +-
drivers/net/can/kvaser_pciefd.c | 2 +-
drivers/net/can/m_can/m_can.c | 2 +-
drivers/net/can/mscan/mscan.c | 2 +-
drivers/net/can/pch_can.c | 2 +-
drivers/net/can/peak_canfd/peak_canfd.c | 2 +-
drivers/net/can/rcar/rcar_can.c | 2 +-
drivers/net/can/rcar/rcar_canfd.c | 15 +++++----------
drivers/net/can/sja1000/sja1000.c | 2 +-
drivers/net/can/slcan/slcan-core.c | 2 +-
drivers/net/can/softing/softing_main.c | 2 +-
drivers/net/can/spi/hi311x.c | 2 +-
drivers/net/can/spi/mcp251x.c | 2 +-
drivers/net/can/spi/mcp251xfd/mcp251xfd-tx.c | 2 +-
drivers/net/can/sun4i_can.c | 2 +-
drivers/net/can/ti_hecc.c | 2 +-
drivers/net/can/usb/ems_usb.c | 2 +-
drivers/net/can/usb/esd_usb.c | 2 +-
drivers/net/can/usb/etas_es58x/es58x_core.c | 2 +-
drivers/net/can/usb/gs_usb.c | 2 +-
drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 2 +-
drivers/net/can/usb/mcba_usb.c | 2 +-
drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +-
drivers/net/can/usb/ucan.c | 2 +-
drivers/net/can/usb/usb_8dev.c | 2 +-
drivers/net/can/xilinx_can.c | 2 +-
include/linux/can/dev.h | 16 ++++++++++++++++
net/can/af_can.c | 3 ++-
net/can/j1939/main.c | 3 +++
38 files changed, 60 insertions(+), 53 deletions(-)
