Commit 23309d60 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Paolo Abeni:
 "Including fixes from netfilter and bpf.

  There are a few fixes for new code bugs, including the Mellanox one
  noted in the last networking pull. No known regressions outstanding.

  Current release - regressions:

   - sched: clear actions pointer in miss cookie init fail

   - mptcp: fix accept vs worker race

   - bpf: fix bpf_arch_text_poke() with new_addr == NULL on s390

   - eth: bnxt_en: fix a possible NULL pointer dereference in unload
     path

   - eth: veth: take into account peer device for
     NETDEV_XDP_ACT_NDO_XMIT xdp_features flag

  Current release - new code bugs:

   - eth: revert "net/mlx5: Enable management PF initialization"

  Previous releases - regressions:

   - netfilter: fix recent physdev match breakage

   - bpf: fix incorrect verifier pruning due to missing register
     precision taints

   - eth: virtio_net: fix overflow inside xdp_linearize_page()

   - eth: cxgb4: fix use after free bugs caused by circular dependency
     problem

   - eth: mlxsw: pci: fix possible crash during initialization

  Previous releases - always broken:

   - sched: sch_qfq: prevent slab-out-of-bounds in qfq_activate_agg

   - netfilter: validate catch-all set elements

   - bridge: don't notify FDB entries with "master dynamic"

   - eth: bonding: fix memory leak when changing bond type to ethernet

   - eth: i40e: fix accessing vsi->active_filters without holding lock

  Misc:

   - Mat is back as MPTCP co-maintainer"

* tag 'net-6.3-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (33 commits)
  net: bridge: switchdev: don't notify FDB entries with "master dynamic"
  Revert "net/mlx5: Enable management PF initialization"
  MAINTAINERS: Resume MPTCP co-maintainer role
  mailmap: add entries for Mat Martineau
  e1000e: Disable TSO on i219-LM card to increase speed
  bnxt_en: fix free-runnig PHC mode
  net: dsa: microchip: ksz8795: Correctly handle huge frame configuration
  bpf: Fix incorrect verifier pruning due to missing register precision taints
  hamradio: drop ISA_DMA_API dependency
  mlxsw: pci: Fix possible crash during initialization
  mptcp: fix accept vs worker race
  mptcp: stops worker on unaccepted sockets at listener close
  net: rpl: fix rpl header size calculation
  net: vmxnet3: Fix NULL pointer dereference in vmxnet3_rq_rx_complete()
  bonding: Fix memory leak when changing bond type to Ethernet
  veth: take into account peer device for NETDEV_XDP_ACT_NDO_XMIT xdp_features flag
  mlxfw: fix null-ptr-deref in mlxfw_mfa2_tlv_next()
  bnxt_en: Fix a possible NULL pointer dereference in unload path
  bnxt_en: Do not initialize PTP on older P3/P4 chips
  netfilter: nf_tables: tighten netlink attribute requirements for catch-all elements
  ...
parents cb085634 927cdea5

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -299,6 +299,8 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm> 
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>

Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>

Mathieu Othacehe <m.othacehe@gmail.com>

Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>

Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>

Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>

Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>

Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>

Documentation/networking/devlink/ice.rst

+15 −0
Original line number Diff line number Diff line
@@ -7,6 +7,21 @@ ice devlink support 
This document describes the devlink features implemented by the ``ice``

device driver.



Parameters

==========



.. list-table:: Generic parameters implemented



   * - Name

     - Mode

     - Notes

   * - ``enable_roce``

     - runtime

     - mutually exclusive with ``enable_iwarp``

   * - ``enable_iwarp``

     - runtime

     - mutually exclusive with ``enable_roce``



Info versions

=============

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14594,6 +14594,7 @@ F: net/netlabel/ 








NETWORKING [MPTCP]









M:	Matthieu Baerts <matthieu.baerts@tessares.net>









M:	Mat Martineau <martineau@kernel.org>









L:	netdev@vger.kernel.org









L:	mptcp@lists.linux.dev









S:	Maintained
































arch/s390/net/bpf_jit_comp.c



+8
−3






























Original line number
Diff line number
Diff line







@@ -539,7 +539,7 @@ static void bpf_jit_plt(void *plt, void *ret, void *target)







{









	memcpy(plt, bpf_plt, BPF_PLT_SIZE);









	*(void **)((char *)plt + (bpf_plt_ret - bpf_plt)) = ret;









	*(void **)((char *)plt + (bpf_plt_target - bpf_plt)) = target;









	*(void **)((char *)plt + (bpf_plt_target - bpf_plt)) = target ?: ret;









}



















/*








@@ -2010,7 +2010,9 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type t,







	} __packed insn;









	char expected_plt[BPF_PLT_SIZE];









	char current_plt[BPF_PLT_SIZE];









	char new_plt[BPF_PLT_SIZE];









	char *plt;









	char *ret;









	int err;



















	/* Verify the branch to be patched. */








@@ -2032,12 +2034,15 @@ int bpf_arch_text_poke(void *ip, enum bpf_text_poke_type t,







		err = copy_from_kernel_nofault(current_plt, plt, BPF_PLT_SIZE);









		if (err < 0)









			return err;









		bpf_jit_plt(expected_plt, (char *)ip + 6, old_addr);









		ret = (char *)ip + 6;









		bpf_jit_plt(expected_plt, ret, old_addr);









		if (memcmp(current_plt, expected_plt, BPF_PLT_SIZE))









			return -EINVAL;









		/* Adjust the call address. */









		bpf_jit_plt(new_plt, ret, new_addr);









		s390_kernel_write(plt + (bpf_plt_target - bpf_plt),









				  &new_addr, sizeof(void *));









				  new_plt + (bpf_plt_target - bpf_plt),









				  sizeof(void *));









	}



















	/* Adjust the mask of the branch. */
































drivers/net/bonding/bond_main.c



+4
−3






























Original line number
Diff line number
Diff line







@@ -1777,14 +1777,15 @@ void bond_lower_state_changed(struct slave *slave)

















/* The bonding driver uses ether_setup() to convert a master bond device









 * to ARPHRD_ETHER, that resets the target netdevice's flags so we always









 * have to restore the IFF_MASTER flag, and only restore IFF_SLAVE if it was set









 * have to restore the IFF_MASTER flag, and only restore IFF_SLAVE and IFF_UP









 * if they were set









 */









static void bond_ether_setup(struct net_device *bond_dev)









{









	unsigned int slave_flag = bond_dev->flags & IFF_SLAVE;









	unsigned int flags = bond_dev->flags & (IFF_SLAVE | IFF_UP);



















	ether_setup(bond_dev);









	bond_dev->flags |= IFF_MASTER | slave_flag;









	bond_dev->flags |= IFF_MASTER | flags;









	bond_dev->priv_flags &= ~IFF_TX_SKB_SHARING;









}