Commit fc858a52 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'net-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 

Pull networking fixes from Jakub Kicinski:
 "Networking fixes for 5.13-rc1, including fixes from bpf, can and
  netfilter trees. Self-contained fixes, nothing risky.

  Current release - new code bugs:

   - dsa: ksz: fix a few bugs found by static-checker in the new driver

   - stmmac: fix frame preemption handshake not triggering after
     interface restart

  Previous releases - regressions:

   - make nla_strcmp handle more then one trailing null character

   - fix stack OOB reads while fragmenting IPv4 packets in openvswitch
     and net/sched

   - sctp: do asoc update earlier in sctp_sf_do_dupcook_a

   - sctp: delay auto_asconf init until binding the first addr

   - stmmac: clear receive all(RA) bit when promiscuous mode is off

   - can: mcp251x: fix resume from sleep before interface was brought up

  Previous releases - always broken:

   - bpf: fix leakage of uninitialized bpf stack under speculation

   - bpf: fix masking negation logic upon negative dst register

   - netfilter: don't assume that skb_header_pointer() will never fail

   - only allow init netns to set default tcp cong to a restricted algo

   - xsk: fix xp_aligned_validate_desc() when len == chunk_size to avoid
     false positive errors

   - ethtool: fix missing NLM_F_MULTI flag when dumping

   - can: m_can: m_can_tx_work_queue(): fix tx_skb race condition

   - sctp: fix a SCTP_MIB_CURRESTAB leak in sctp_sf_do_dupcook_b

   - bridge: fix NULL-deref caused by a races between assigning
     rx_handler_data and setting the IFF_BRIDGE_PORT bit

  Latecomer:

   - seg6: add counters support for SRv6 Behaviors"

* tag 'net-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (73 commits)
  atm: firestream: Use fallthrough pseudo-keyword
  net: stmmac: Do not enable RX FIFO overflow interrupts
  mptcp: fix splat when closing unaccepted socket
  i40e: Remove LLDP frame filters
  i40e: Fix PHY type identifiers for 2.5G and 5G adapters
  i40e: fix the restart auto-negotiation after FEC modified
  i40e: Fix use-after-free in i40e_client_subtask()
  i40e: fix broken XDP support
  netfilter: nftables: avoid potential overflows on 32bit arches
  netfilter: nftables: avoid overflows in nft_hash_buckets()
  tcp: Specify cmsgbuf is user pointer for receive zerocopy.
  mlxsw: spectrum_mr: Update egress RIF list before route's action
  net: ipa: fix inter-EE IRQ register definitions
  can: m_can: m_can_tx_work_queue(): fix tx_skb race condition
  can: mcp251x: fix resume from sleep before interface was brought up
  can: mcp251xfd: mcp251xfd_probe(): add missing can_rx_offload_del() in error path
  can: mcp251xfd: mcp251xfd_probe(): fix an error pointer dereference in probe
  netfilter: nftables: Fix a memleak from userdata error path in new objects
  netfilter: remove BUG_ON() after skb_header_pointer()
  netfilter: nfnetlink_osf: Fix a missing skb_header_pointer() NULL check
  ...
parents dd860052 55bc1af3

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -1874,6 +1874,11 @@ S: Krosenska' 543 
S: 181 00 Praha 8

S: Czech Republic



N: Murali Karicheri

E: m-karicheri2@ti.com

D: Keystone NetCP driver

D: Keystone PCIe host controller driver



N: Jan "Yenya" Kasprzak

E: kas@fi.muni.cz

D: Author of the COSA/SRP sync serial board driver.

Documentation/ABI/testing/sysfs-class-net-qmi

+16 −0
Original line number Diff line number Diff line
@@ -58,3 +58,19 @@ Description: 


		Indicates the mux id associated to the qmimux network interface

		during its creation.



What:		/sys/class/net/<iface>/qmi/pass_through

Date:		January 2021

KernelVersion:	5.12

Contact:	Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

Description:

		Boolean.  Default: 'N'



		Set this to 'Y' to enable 'pass-through' mode, allowing packets

		in MAP format to be passed on to the stack.



		Normally the rmnet driver (CONFIG_RMNET) is then used to process

		and demultiplex these packets.



		'Pass-through' mode can be enabled when the device is in

		'raw-ip' mode only.

MAINTAINERS

+2 −14
Original line number Diff line number Diff line
@@ -624,6 +624,7 @@ F: fs/affs/ 








AFS FILESYSTEM









M:	David Howells <dhowells@redhat.com>









M:	Marc Dionne <marc.dionne@auristor.com>









L:	linux-afs@lists.infradead.org









S:	Supported









W:	https://www.infradead.org/~dhowells/kafs/








@@ -14099,13 +14100,6 @@ F:	Documentation/devicetree/bindings/pci/ti-pci.txt







F:	drivers/pci/controller/cadence/pci-j721e.c









F:	drivers/pci/controller/dwc/pci-dra7xx.c

















PCI DRIVER FOR TI KEYSTONE









M:	Murali Karicheri <m-karicheri2@ti.com>









L:	linux-pci@vger.kernel.org









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









F:	drivers/pci/controller/dwc/pci-keystone.c

















PCI DRIVER FOR V3 SEMICONDUCTOR V360EPC









M:	Linus Walleij <linus.walleij@linaro.org>









L:	linux-pci@vger.kernel.org








@@ -15891,6 +15885,7 @@ F:	drivers/infiniband/ulp/rtrs/















RXRPC SOCKETS (AF_RXRPC)









M:	David Howells <dhowells@redhat.com>









M:	Marc Dionne <marc.dionne@auristor.com>









L:	linux-afs@lists.infradead.org









S:	Supported









W:	https://www.infradead.org/~dhowells/kafs/








@@ -18307,13 +18302,6 @@ S:	Maintained







F:	sound/soc/codecs/isabelle*









F:	sound/soc/codecs/lm49453*

















TI NETCP ETHERNET DRIVER









M:	Wingman Kwok <w-kwok2@ti.com>









M:	Murali Karicheri <m-karicheri2@ti.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/ti/netcp*

















TI PCM3060 ASoC CODEC DRIVER









M:	Kirill Marinushkin <kmarinushkin@birdec.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

























drivers/atm/firestream.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -795,6 +795,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)







		switch (STATUS_CODE (qe)) {









		case 0x1:









			/* Fall through for streaming mode */









			fallthrough;









		case 0x2:/* Packet received OK.... */









			if (atm_vcc) {









				skb = pe->skb;
































drivers/net/can/m_can/m_can.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -1562,6 +1562,8 @@ static netdev_tx_t m_can_tx_handler(struct m_can_classdev *cdev)







	int i;









	int putidx;



















	cdev->tx_skb = NULL;



















	/* Generate ID field for TX buffer Element */









	/* Common to all supported M_CAN versions */









	if (cf->can_id & CAN_EFF_FLAG) {








@@ -1678,7 +1680,6 @@ static void m_can_tx_work_queue(struct work_struct *ws)







						   tx_work);



















	m_can_tx_handler(cdev);









	cdev->tx_skb = NULL;









}



















static netdev_tx_t m_can_start_xmit(struct sk_buff *skb,