Commit 01f856ae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from bpf, can and wifi.

  Current release - new code bugs:

   - eth: mlx5e:
      - use kvfree() in mlx5e_accel_fs_tcp_create()
      - MACsec, fix RX data path 16 RX security channel limit
      - MACsec, fix memory leak when MACsec device is deleted
      - MACsec, fix update Rx secure channel active field
      - MACsec, fix add Rx security association (SA) rule memory leak

  Previous releases - regressions:

   - wifi: cfg80211: don't allow multi-BSSID in S1G

   - stmmac: set MAC's flow control register to reflect current settings

   - eth: mlx5:
      - E-switch, fix duplicate lag creation
      - fix use-after-free when reverting termination table

  Previous releases - always broken:

   - ipv4: fix route deletion when nexthop info is not specified

   - bpf: fix a local storage BPF map bug where the value's spin lock
     field can get initialized incorrectly

   - tipc: re-fetch skb cb after tipc_msg_validate

   - wifi: wilc1000: fix Information Element parsing

   - packet: do not set TP_STATUS_CSUM_VALID on CHECKSUM_COMPLETE

   - sctp: fix memory leak in sctp_stream_outq_migrate()

   - can: can327: fix potential skb leak when netdev is down

   - can: add number of missing netdev freeing on error paths

   - aquantia: do not purge addresses when setting the number of rings

   - wwan: iosm:
      - fix incorrect skb length leading to truncated packet
      - fix crash in peek throughput test due to skb UAF"

* tag 'net-6.1-rc8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (79 commits)
  net: ethernet: renesas: ravb: Fix promiscuous mode after system resumed
  MAINTAINERS: Update maintainer list for chelsio drivers
  ionic: update MAINTAINERS entry
  sctp: fix memory leak in sctp_stream_outq_migrate()
  packet: do not set TP_STATUS_CSUM_VALID on CHECKSUM_COMPLETE
  net/mlx5: Lag, Fix for loop when checking lag
  Revert "net/mlx5e: MACsec, remove replay window size limitation in offload path"
  net: marvell: prestera: Fix a NULL vs IS_ERR() check in some functions
  net: tun: Fix use-after-free in tun_detach()
  net: mdiobus: fix unbalanced node reference count
  net: hsr: Fix potential use-after-free
  tipc: re-fetch skb cb after tipc_msg_validate
  mptcp: fix sleep in atomic at close time
  mptcp: don't orphan ssk in mptcp_close()
  dsa: lan9303: Correct stat name
  ipv4: Fix route deletion when nexthop info is not specified
  net: wwan: iosm: fix incorrect skb length
  net: wwan: iosm: fix crash in peek throughput test
  net: wwan: iosm: fix dma_alloc_coherent incompatible pointer type
  net: wwan: iosm: fix kernel test robot reported error
  ...
parents ca57f022 d66233a3

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk> 
Sebastian Reichel <sre@kernel.org> <sre@debian.org>

Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>

Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>

Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>

Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>

MAINTAINERS

+3 −8
Original line number Diff line number Diff line
@@ -5585,8 +5585,6 @@ F: drivers/scsi/cxgbi/cxgb3i 








CXGB4 CRYPTO DRIVER (chcr)









M:	Ayush Sawal <ayush.sawal@chelsio.com>









M:	Vinay Kumar Yadav <vinay.yadav@chelsio.com>









M:	Rohit Maheshwari <rohitm@chelsio.com>









L:	linux-crypto@vger.kernel.org









S:	Supported









W:	http://www.chelsio.com








@@ -5594,8 +5592,6 @@ F:	drivers/crypto/chelsio















CXGB4 INLINE CRYPTO DRIVER









M:	Ayush Sawal <ayush.sawal@chelsio.com>









M:	Vinay Kumar Yadav <vinay.yadav@chelsio.com>









M:	Rohit Maheshwari <rohitm@chelsio.com>









L:	netdev@vger.kernel.org









S:	Supported









W:	http://www.chelsio.com








@@ -16149,7 +16145,8 @@ F:	include/linux/peci-cpu.h







F:	include/linux/peci.h

















PENSANDO ETHERNET DRIVERS









M:	Shannon Nelson <snelson@pensando.io>









M:	Shannon Nelson <shannon.nelson@amd.com>









M:	Brett Creeley <brett.creeley@amd.com>









M:	drivers@pensando.io









L:	netdev@vger.kernel.org









S:	Supported








@@ -17485,10 +17482,8 @@ S:	Maintained







F:	drivers/net/wireless/realtek/rtw89/

















REDPINE WIRELESS DRIVER









M:	Amitkumar Karwar <amitkarwar@gmail.com>









M:	Siva Rebbagondla <siva8118@gmail.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









S:	Orphan









F:	drivers/net/wireless/rsi/

















REGISTER MAP ABSTRACTION

























drivers/net/can/can327.c



+3
−1






























Original line number
Diff line number
Diff line







@@ -263,8 +263,10 @@ static void can327_feed_frame_to_netdev(struct can327 *elm, struct sk_buff *skb)







{









	lockdep_assert_held(&elm->lock);



















	if (!netif_running(elm->dev))









	if (!netif_running(elm->dev)) {









		kfree_skb(skb);









		return;









	}



















	/* Queue for NAPI pickup.









	 * rx-offload will update stats and LEDs for us.
































drivers/net/can/cc770/cc770_isa.c



+6
−4






























Original line number
Diff line number
Diff line







@@ -264,13 +264,15 @@ static int cc770_isa_probe(struct platform_device *pdev)







	if (err) {









		dev_err(&pdev->dev,









			"couldn't register device (err=%d)\n", err);









		goto exit_unmap;









		goto exit_free;









	}



















	dev_info(&pdev->dev, "device registered (reg_base=0x%p, irq=%d)\n",









		 priv->reg_base, dev->irq);









	return 0;



















exit_free:









	free_cc770dev(dev);









exit_unmap:









	if (mem[idx])









		iounmap(base);
































drivers/net/can/m_can/m_can.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1909,7 +1909,7 @@ int m_can_class_get_clocks(struct m_can_classdev *cdev)







	cdev->hclk = devm_clk_get(cdev->dev, "hclk");









	cdev->cclk = devm_clk_get(cdev->dev, "cclk");



















	if (IS_ERR(cdev->cclk)) {









	if (IS_ERR(cdev->hclk) || IS_ERR(cdev->cclk)) {









		dev_err(cdev->dev, "no clock found\n");









		ret = -ENODEV;









	}