Commit 7475e51b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Current release - regressions:

   - core: fix undefined behavior in netdev name allocation

   - bpf: do not allocate percpu memory at init stage

   - netfilter: nf_tables: split async and sync catchall in two
     functions

   - mptcp: fix possible NULL pointer dereference on close

  Current release - new code bugs:

   - eth: ice: dpll: fix initial lock status of dpll

  Previous releases - regressions:

   - bpf: fix precision backtracking instruction iteration

   - af_unix: fix use-after-free in unix_stream_read_actor()

   - tipc: fix kernel-infoleak due to uninitialized TLV value

   - eth: bonding: stop the device in bond_setup_by_slave()

   - eth: mlx5:
      - fix double free of encap_header
      - avoid referencing skb after free-ing in drop path

   - eth: hns3: fix VF reset

   - eth: mvneta: fix calls to page_pool_get_stats

  Previous releases - always broken:

   - core: set SOCK_RCU_FREE before inserting socket into hashtable

   - bpf: fix control-flow graph checking in privileged mode

   - eth: ppp: limit MRU to 64K

   - eth: stmmac: avoid rx queue overrun

   - eth: icssg-prueth: fix error cleanup on failing initialization

   - eth: hns3: fix out-of-bounds access may occur when coalesce info is
     read via debugfs

   - eth: cortina: handle large frames

  Misc:

   - selftests: gso: support CONFIG_MAX_SKB_FRAGS up to 45"

* tag 'net-6.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (78 commits)
  macvlan: Don't propagate promisc change to lower dev in passthru
  net: sched: do not offload flows with a helper in act_ct
  net/mlx5e: Check return value of snprintf writing to fw_version buffer for representors
  net/mlx5e: Check return value of snprintf writing to fw_version buffer
  net/mlx5e: Reduce the size of icosq_str
  net/mlx5: Increase size of irq name buffer
  net/mlx5e: Update doorbell for port timestamping CQ before the software counter
  net/mlx5e: Track xmit submission to PTP WQ after populating metadata map
  net/mlx5e: Avoid referencing skb after free-ing in drop path of mlx5e_sq_xmit_wqe
  net/mlx5e: Don't modify the peer sent-to-vport rules for IPSec offload
  net/mlx5e: Fix pedit endianness
  net/mlx5e: fix double free of encap_header in update funcs
  net/mlx5e: fix double free of encap_header
  net/mlx5: Decouple PHC .adjtime and .adjphase implementations
  net/mlx5: DR, Allow old devices to use multi destination FTE
  net/mlx5: Free used cpus mask when an IRQ is released
  Revert "net/mlx5: DR, Supporting inline WQE when possible"
  bpf: Do not allocate percpu memory at init stage
  net: Fix undefined behavior in netdev name allocation
  dt-bindings: net: ethernet-controller: Fix formatting error
  ...
parents 6eb1acd9 cff088d9

MAINTAINERS

+12 −1
Original line number Diff line number Diff line
@@ -21768,7 +21768,9 @@ F: Documentation/devicetree/bindings/counter/ti-eqep.yaml 
F:	drivers/counter/ti-eqep.c









TI ETHERNET SWITCH DRIVER (CPSW)









R:	Grygorii Strashko <grygorii.strashko@ti.com>









R:	Siddharth Vadapalli <s-vadapalli@ti.com>









R:	Ravi Gunasekaran <r-gunasekaran@ti.com>









R:	Roger Quadros <rogerq@kernel.org>









L:	linux-omap@vger.kernel.org









L:	netdev@vger.kernel.org









S:	Maintained








@@ -21792,6 +21794,15 @@ F:	Documentation/devicetree/bindings/media/i2c/ti,ds90*







F:	drivers/media/i2c/ds90*









F:	include/media/i2c/ds90*

















TI ICSSG ETHERNET DRIVER (ICSSG)









R:	MD Danish Anwar <danishanwar@ti.com>









R:	Roger Quadros <rogerq@kernel.org>









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









L:	netdev@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/net/ti,icss*.yaml









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

















TI J721E CSI2RX DRIVER









M:	Jai Luthra <j-luthra@ti.com>









L:	linux-media@vger.kernel.org

























drivers/net/bonding/bond_main.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -1500,6 +1500,10 @@ static void bond_compute_features(struct bonding *bond)







static void bond_setup_by_slave(struct net_device *bond_dev,









				struct net_device *slave_dev)









{









	bool was_up = !!(bond_dev->flags & IFF_UP);



















	dev_close(bond_dev);



















	bond_dev->header_ops	    = slave_dev->header_ops;



















	bond_dev->type		    = slave_dev->type;








@@ -1514,6 +1518,8 @@ static void bond_setup_by_slave(struct net_device *bond_dev,







		bond_dev->flags &= ~(IFF_BROADCAST | IFF_MULTICAST);









		bond_dev->flags |= (IFF_POINTOPOINT | IFF_NOARP);









	}









	if (was_up)









		dev_open(bond_dev, NULL);









}



















/* On bonding slaves other than the currently active slave, suppress
































drivers/net/ethernet/amd/pds_core/adminq.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -146,7 +146,7 @@ irqreturn_t pdsc_adminq_isr(int irq, void *data)







	}



















	queue_work(pdsc->wq, &qcq->work);









	pds_core_intr_mask(&pdsc->intr_ctrl[irq], PDS_CORE_INTR_MASK_CLEAR);









	pds_core_intr_mask(&pdsc->intr_ctrl[qcq->intx], PDS_CORE_INTR_MASK_CLEAR);



















	return IRQ_HANDLED;









}
































drivers/net/ethernet/amd/pds_core/core.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -15,7 +15,7 @@







#define PDSC_DRV_DESCRIPTION	"AMD/Pensando Core Driver"



















#define PDSC_WATCHDOG_SECS	5









#define PDSC_QUEUE_NAME_MAX_SZ  32









#define PDSC_QUEUE_NAME_MAX_SZ  16









#define PDSC_ADMINQ_MIN_LENGTH	16	/* must be a power of two */









#define PDSC_NOTIFYQ_LENGTH	64	/* must be a power of two */









#define PDSC_TEARDOWN_RECOVERY	false
































drivers/net/ethernet/amd/pds_core/dev.c



+6
−2






























Original line number
Diff line number
Diff line







@@ -261,10 +261,14 @@ static int pdsc_identify(struct pdsc *pdsc)







	struct pds_core_drv_identity drv = {};









	size_t sz;









	int err;









	int n;



















	drv.drv_type = cpu_to_le32(PDS_DRIVER_LINUX);









	snprintf(drv.driver_ver_str, sizeof(drv.driver_ver_str),









	/* Catching the return quiets a Wformat-truncation complaint */









	n = snprintf(drv.driver_ver_str, sizeof(drv.driver_ver_str),









		     "%s %s", PDS_CORE_DRV_NAME, utsname()->release);









	if (n > sizeof(drv.driver_ver_str))









		dev_dbg(pdsc->dev, "release name truncated, don't care\n");



















	/* Next let's get some info about the device









	 * We use the devcmd_lock at this level in order to