Commit 7c5e046b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Current release - regressions:

   - bpf: syzkaller found null ptr deref in unix_bpf proto add

   - eth: i40e: fix ST code value for clause 45

  Previous releases - regressions:

   - core: return error from sk_stream_wait_connect() if sk_wait_event()
     fails

   - ipv6: revert remove expired routes with a separated list of routes

   - wifi rfkill:
       - set GPIO direction
       - fix crash with WED rx support enabled

   - bluetooth:
       - fix deadlock in vhci_send_frame
       - fix use-after-free in bt_sock_recvmsg

   - eth: mlx5e: fix a race in command alloc flow

   - eth: ice: fix PF with enabled XDP going no-carrier after reset

   - eth: bnxt_en: do not map packet buffers twice

  Previous releases - always broken:

   - core:
       - check vlan filter feature in vlan_vids_add_by_dev() and
         vlan_vids_del_by_dev()
       - check dev->gso_max_size in gso_features_check()

   - mptcp: fix inconsistent state on fastopen race

   - phy: skip LED triggers on PHYs on SFP modules

   - eth: mlx5e:
       - fix double free of encap_header
       - fix slab-out-of-bounds in mlx5_query_nic_vport_mac_list()"

* tag 'net-6.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (69 commits)
  net: check dev->gso_max_size in gso_features_check()
  kselftest: rtnetlink.sh: use grep_fail when expecting the cmd fail
  net/ipv6: Revert remove expired routes with a separated list of routes
  net: avoid build bug in skb extension length calculation
  net: ethernet: mtk_wed: fix possible NULL pointer dereference in mtk_wed_wo_queue_tx_clean()
  net: stmmac: fix incorrect flag check in timestamp interrupt
  selftests: add vlan hw filter tests
  net: check vlan filter feature in vlan_vids_add_by_dev() and vlan_vids_del_by_dev()
  net: hns3: add new maintainer for the HNS3 ethernet driver
  net: mana: select PAGE_POOL
  net: ks8851: Fix TX stall caused by TX buffer overrun
  ice: Fix PF with enabled XDP going no-carrier after reset
  ice: alter feature support check for SRIOV and LAG
  ice: stop trashing VF VSI aggregator node ID information
  mailmap: add entries for Geliang Tang
  mptcp: fill in missing MODULE_DESCRIPTION()
  mptcp: fix inconsistent state on fastopen race
  selftests: mptcp: join: fix subflow_send_ack lookup
  net: phy: skip LED triggers on PHYs on SFP modules
  bpf: Add missing BPF_LINK_TYPE invocations
  ...
parents a4aebe93 74769d81

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -191,6 +191,10 @@ Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com> 
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>

Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>

Geliang Tang <geliang.tang@linux.dev> <geliang.tang@suse.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@xiaomi.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@gmail.com>

Geliang Tang <geliang.tang@linux.dev> <geliangtang@163.com>

Georgi Djakov <djakov@kernel.org> <georgi.djakov@linaro.org>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>

Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9524,6 +9524,7 @@ F: drivers/bus/hisi_lpc.c 
HISILICON NETWORK SUBSYSTEM 3 DRIVER (HNS3)

M:	Yisen Zhuang <yisen.zhuang@huawei.com>

M:	Salil Mehta <salil.mehta@huawei.com>

M:	Jijie Shao <shaojijie@huawei.com>

L:	netdev@vger.kernel.org

S:	Maintained

W:	http://www.hisilicon.com

drivers/bluetooth/hci_vhci.c

+6 −4
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/module.h>

#include <asm/unaligned.h>



#include <linux/atomic.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/slab.h>
@@ -44,6 +45,7 @@ struct vhci_data { 
	bool wakeup;

	__u16 msft_opcode;

	bool aosp_capable;

	atomic_t initialized;

};



static int vhci_open_dev(struct hci_dev *hdev)
@@ -75,10 +77,9 @@ static int vhci_send_frame(struct hci_dev *hdev, struct sk_buff *skb) 


	memcpy(skb_push(skb, 1), &hci_skb_pkt_type(skb), 1);



	mutex_lock(&data->open_mutex);

	skb_queue_tail(&data->readq, skb);

	mutex_unlock(&data->open_mutex);



	if (atomic_read(&data->initialized))

		wake_up_interruptible(&data->read_wait);

	return 0;

}
@@ -464,7 +465,8 @@ static int __vhci_create_device(struct vhci_data *data, __u8 opcode) 
	skb_put_u8(skb, 0xff);

	skb_put_u8(skb, opcode);

	put_unaligned_le16(hdev->id, skb_put(skb, 2));

	skb_queue_tail(&data->readq, skb);

	skb_queue_head(&data->readq, skb);

	atomic_inc(&data->initialized);



	wake_up_interruptible(&data->read_wait);

	return 0;

drivers/net/ethernet/atheros/atl1e/atl1e_main.c

+4 −1
Original line number Diff line number Diff line
@@ -866,10 +866,13 @@ static int atl1e_setup_ring_resources(struct atl1e_adapter *adapter) 
		netdev_err(adapter->netdev, "offset(%d) > ring size(%d) !!\n",

			   offset, adapter->ring_size);

		err = -1;

		goto failed;

		goto free_buffer;

	}



	return 0;

free_buffer:

	kfree(tx_ring->tx_buffer);

	tx_ring->tx_buffer = NULL;

failed:

	if (adapter->ring_vir_addr != NULL) {

		dma_free_coherent(&pdev->dev, adapter->ring_size,

drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c

+2 −9
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ struct bnxt_sw_tx_bd *bnxt_xmit_bd(struct bnxt *bp, 
	for (i = 0; i < num_frags ; i++) {

		skb_frag_t *frag = &sinfo->frags[i];

		struct bnxt_sw_tx_bd *frag_tx_buf;

		struct pci_dev *pdev = bp->pdev;

		dma_addr_t frag_mapping;

		int frag_len;
@@ -73,16 +72,10 @@ struct bnxt_sw_tx_bd *bnxt_xmit_bd(struct bnxt *bp, 
		txbd = &txr->tx_desc_ring[TX_RING(prod)][TX_IDX(prod)];



		frag_len = skb_frag_size(frag);

		frag_mapping = skb_frag_dma_map(&pdev->dev, frag, 0,

						frag_len, DMA_TO_DEVICE);



		if (unlikely(dma_mapping_error(&pdev->dev, frag_mapping)))

			return NULL;



		dma_unmap_addr_set(frag_tx_buf, mapping, frag_mapping);



		flags = frag_len << TX_BD_LEN_SHIFT;

		txbd->tx_bd_len_flags_type = cpu_to_le32(flags);

		frag_mapping = page_pool_get_dma_addr(skb_frag_page(frag)) +

			       skb_frag_off(frag);

		txbd->tx_bd_haddr = cpu_to_le64(frag_mapping);



		len = frag_len;