Commit 8d0112ac authored Nov 18, 2021 by Linus Torvalds

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf, mac80211.

  Current release - regressions:

   - devlink: don't throw an error if flash notification sent before
     devlink visible

   - page_pool: Revert "page_pool: disable dma mapping support...",
     turns out there are active arches who need it

  Current release - new code bugs:

   - amt: cancel delayed_work synchronously in amt_fini()

  Previous releases - regressions:

   - xsk: fix crash on double free in buffer pool

   - bpf: fix inner map state pruning regression causing program
     rejections

   - mac80211: drop check for DONT_REORDER in __ieee80211_select_queue,
     preventing mis-selecting the best effort queue

   - mac80211: do not access the IV when it was stripped

   - mac80211: fix radiotap header generation, off-by-one

   - nl80211: fix getting radio statistics in survey dump

   - e100: fix device suspend/resume

  Previous releases - always broken:

   - tcp: fix uninitialized access in skb frags array for Rx 0cp

   - bpf: fix toctou on read-only map's constant scalar tracking

   - bpf: forbid bpf_ktime_get_coarse_ns and bpf_timer_* in tracing
     progs

   - tipc: only accept encrypted MSG_CRYPTO msgs

   - smc: transfer remaining wait queue entries during fallback, fix
     missing wake ups

   - udp: validate checksum in udp_read_sock() (when sockmap is used)

   - sched: act_mirred: drop dst for the direction from egress to
     ingress

   - virtio_net_hdr_to_skb: count transport header in UFO, prevent
     allowing bad skbs into the stack

   - nfc: reorder the logic in nfc_{un,}register_device, fix unregister

   - ipsec: check return value of ipv6_skip_exthdr

   - usb: r8152: add MAC passthrough support for more Lenovo Docks"

* tag 'net-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (96 commits)
  ptp: ocp: Fix a couple NULL vs IS_ERR() checks
  net: ethernet: dec: tulip: de4x5: fix possible array overflows in type3_infoblock()
  net: tulip: de4x5: fix the problem that the array 'lp->phy[8]' may be out of bound
  ipv6: check return value of ipv6_skip_exthdr
  e100: fix device suspend/resume
  devlink: Don't throw an error if flash notification sent before devlink visible
  page_pool: Revert "page_pool: disable dma mapping support..."
  ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in hns_dsaf_ge_srst_by_port()
  octeontx2-af: debugfs: don't corrupt user memory
  NFC: add NCI_UNREG flag to eliminate the race
  NFC: reorder the logic in nfc_{un,}register_device
  NFC: reorganize the functions in nci_request
  tipc: check for null after calling kmemdup
  i40e: Fix display error code in dmesg
  i40e: Fix creation of first queue by omitting it if is not power of two
  i40e: Fix warning message and call stack during rmmod i40e driver
  i40e: Fix ping is lost after configuring ADq on VF
  i40e: Fix changing previously set num_queue_pairs for PFs
  i40e: Fix NULL ptr dereference on VSI filter sync
  i40e: Fix correct max_pkt_size on VF RX queue
  ...

parents 6fdf8864 c7521d3a

MAINTAINERS

+2 −2

Original line number	Diff line number	Diff line
		@@ -3733,7 +3733,7 @@ F: drivers/scsi/bnx2i/
		BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
		M: Ariel Elior <aelior@marvell.com>
		M: Sudarsana Kalluru <skalluru@marvell.com>
		M: GR-everest-linux-l2@marvell.com
		M: Manish Chopra <manishc@marvell.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/broadcom/bnx2x/
		@@ -15593,7 +15593,7 @@ F: drivers/scsi/qedi/

		QLOGIC QL4xxx ETHERNET DRIVER
		M: Ariel Elior <aelior@marvell.com>
		M: GR-everest-linux-l2@marvell.com
		M: Manish Chopra <manishc@marvell.com>
		L: netdev@vger.kernel.org
		S: Supported
		F: drivers/net/ethernet/qlogic/qed/

drivers/net/amt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3286,7 +3286,7 @@ static void __exit amt_fini(void)
		{
		rtnl_link_unregister(&amt_link_ops);
		unregister_netdevice_notifier(&amt_notifier_block);
		cancel_delayed_work(&source_gc_wq);
		cancel_delayed_work_sync(&source_gc_wq);
		__amt_source_gc_work();
		destroy_workqueue(amt_wq);
		}

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -559,6 +559,11 @@ int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self,
		goto err_exit;

		if (fw.len == 0xFFFFU) {
		if (sw.len > sizeof(self->rpc)) {
		printk(KERN_INFO "Invalid sw len: %x\n", sw.len);
		err = -EINVAL;
		goto err_exit;
		}
		err = hw_atl_utils_fw_rpc_call(self, sw.len);
		if (err < 0)
		goto err_exit;
		@@ -567,6 +572,11 @@ int hw_atl_utils_fw_rpc_wait(struct aq_hw_s *self,

		if (rpc) {
		if (fw.len) {
		if (fw.len > sizeof(self->rpc)) {
		printk(KERN_INFO "Invalid fw len: %x\n", fw.len);
		err = -EINVAL;
		goto err_exit;
		}
		err =
		hw_atl_utils_fw_downld_dwords(self,
		self->rpc_addr,

drivers/net/ethernet/asix/ax88796c_main.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -127,9 +127,9 @@ struct ax88796c_device {
		#define AX_PRIV_FLAGS_MASK (AX_CAP_COMP)

		unsigned long flags;
		#define EVENT_INTR BIT(0)
		#define EVENT_TX BIT(1)
		#define EVENT_SET_MULTI BIT(2)
		#define EVENT_INTR 0
		#define EVENT_TX 1
		#define EVENT_SET_MULTI 2

		};

drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -635,11 +635,13 @@ static int bnx2x_ilt_client_mem_op(struct bnx2x *bp, int cli_num,
		{
		int i, rc;
		struct bnx2x_ilt *ilt = BP_ILT(bp);
		struct ilt_client_info *ilt_cli = &ilt->clients[cli_num];
		struct ilt_client_info *ilt_cli;

		if (!ilt \|\| !ilt->lines)
		return -1;

		ilt_cli = &ilt->clients[cli_num];

		if (ilt_cli->flags & (ILT_CLIENT_SKIP_INIT \| ILT_CLIENT_SKIP_MEM))
		return 0;