Commit 6d36c728 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Current release - regressions:

   - revert "net: fix cpu_max_bits_warn() usage in
     netif_attrmask_next{,_and}"

   - revert "net: sched: fq_codel: remove redundant resource cleanup in
     fq_codel_init()"

   - dsa: uninitialized variable in dsa_slave_netdevice_event()

   - eth: sunhme: uninitialized variable in happy_meal_init()

  Current release - new code bugs:

   - eth: octeontx2: fix resource not freed after malloc

  Previous releases - regressions:

   - sched: fix return value of qdisc ingress handling on success

   - sched: fix race condition in qdisc_graft()

   - udp: update reuse->has_conns under reuseport_lock.

   - tls: strp: make sure the TCP skbs do not have overlapping data

   - hsr: avoid possible NULL deref in skb_clone()

   - tipc: fix an information leak in tipc_topsrv_kern_subscr

   - phylink: add mac_managed_pm in phylink_config structure

   - eth: i40e: fix DMA mappings leak

   - eth: hyperv: fix a RX-path warning

   - eth: mtk: fix memory leaks

  Previous releases - always broken:

   - sched: cake: fix null pointer access issue when cake_init() fails"

* tag 'net-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (43 commits)
  net: phy: dp83822: disable MDI crossover status change interrupt
  net: sched: fix race condition in qdisc_graft()
  net: hns: fix possible memory leak in hnae_ae_register()
  wwan_hwsim: fix possible memory leak in wwan_hwsim_dev_new()
  sfc: include vport_id in filter spec hash and equal()
  genetlink: fix kdoc warnings
  selftests: add selftest for chaining of tc ingress handling to egress
  net: Fix return value of qdisc ingress handling on success
  net: sched: sfb: fix null pointer access issue when sfb_init() fails
  Revert "net: sched: fq_codel: remove redundant resource cleanup in fq_codel_init()"
  net: sched: cake: fix null pointer access issue when cake_init() fails
  ethernet: marvell: octeontx2 Fix resource not freed after malloc
  netfilter: nf_tables: relax NFTA_SET_ELEM_KEY_END set flags requirements
  netfilter: rpfilter/fib: Set ->flowic_uid correctly for user namespaces.
  ionic: catch NULL pointer issue on reconfig
  net: hsr: avoid possible NULL deref in skb_clone()
  bnxt_en: fix memory leak in bnxt_nvm_test()
  ip6mr: fix UAF issue in ip6mr_sk_done() when addrconf_init_net() failed
  udp: Update reuse->has_conns under reuseport_lock.
  net: ethernet: mediatek: ppe: Remove the unused function mtk_foe_entry_usable()
  ...
parents c7b00652 7f378c03

Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ title: Samsung S3FWRN5 NCI NFC Controller 


maintainers:

  - Krzysztof Kozlowski <krzk@kernel.org>

  - Krzysztof Opasiak <k.opasiak@samsung.com>



properties:

  compatible:

MAINTAINERS

+2 −3
Original line number Diff line number Diff line
@@ -18215,7 +18215,6 @@ F: include/media/drv-intf/s3c_camif.h 








SAMSUNG S3FWRN5 NFC DRIVER









M:	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>









M:	Krzysztof Opasiak <k.opasiak@samsung.com>









L:	linux-nfc@lists.01.org (subscribers-only)









S:	Maintained









F:	Documentation/devicetree/bindings/net/nfc/samsung,s3fwrn5.yaml








@@ -21297,7 +21296,7 @@ L:	linux-usb@vger.kernel.org







L:	netdev@vger.kernel.org









S:	Maintained









W:	https://github.com/petkan/pegasus









T:	git git://github.com/petkan/pegasus.git









T:	git https://github.com/petkan/pegasus.git









F:	drivers/net/usb/pegasus.*

















USB PHY LAYER








@@ -21334,7 +21333,7 @@ L:	linux-usb@vger.kernel.org







L:	netdev@vger.kernel.org









S:	Maintained









W:	https://github.com/petkan/rtl8150









T:	git git://github.com/petkan/rtl8150.git









T:	git https://github.com/petkan/rtl8150.git









F:	drivers/net/usb/rtl8150.c

















USB SERIAL SUBSYSTEM

























drivers/net/dsa/qca/qca8k-8xxx.c



+55
−28






























Original line number
Diff line number
Diff line







@@ -137,27 +137,42 @@ static void qca8k_rw_reg_ack_handler(struct dsa_switch *ds, struct sk_buff *skb)







	struct qca8k_mgmt_eth_data *mgmt_eth_data;









	struct qca8k_priv *priv = ds->priv;









	struct qca_mgmt_ethhdr *mgmt_ethhdr;









	u32 command;









	u8 len, cmd;









	int i;



















	mgmt_ethhdr = (struct qca_mgmt_ethhdr *)skb_mac_header(skb);









	mgmt_eth_data = &priv->mgmt_eth_data;



















	cmd = FIELD_GET(QCA_HDR_MGMT_CMD, mgmt_ethhdr->command);









	len = FIELD_GET(QCA_HDR_MGMT_LENGTH, mgmt_ethhdr->command);









	command = get_unaligned_le32(&mgmt_ethhdr->command);









	cmd = FIELD_GET(QCA_HDR_MGMT_CMD, command);









	len = FIELD_GET(QCA_HDR_MGMT_LENGTH, command);



















	/* Make sure the seq match the requested packet */









	if (mgmt_ethhdr->seq == mgmt_eth_data->seq)









	if (get_unaligned_le32(&mgmt_ethhdr->seq) == mgmt_eth_data->seq)









		mgmt_eth_data->ack = true;



















	if (cmd == MDIO_READ) {









		mgmt_eth_data->data[0] = mgmt_ethhdr->mdio_data;









		u32 *val = mgmt_eth_data->data;



















		*val = get_unaligned_le32(&mgmt_ethhdr->mdio_data);



















		/* Get the rest of the 12 byte of data.









		 * The read/write function will extract the requested data.









		 */









		if (len > QCA_HDR_MGMT_DATA1_LEN)









			memcpy(mgmt_eth_data->data + 1, skb->data,









			       QCA_HDR_MGMT_DATA2_LEN);









		if (len > QCA_HDR_MGMT_DATA1_LEN) {









			__le32 *data2 = (__le32 *)skb->data;









			int data_len = min_t(int, QCA_HDR_MGMT_DATA2_LEN,









					     len - QCA_HDR_MGMT_DATA1_LEN);



















			val++;



















			for (i = sizeof(u32); i <= data_len; i += sizeof(u32)) {









				*val = get_unaligned_le32(data2);









				val++;









				data2++;









			}









		}









	}



















	complete(&mgmt_eth_data->rw_done);








@@ -169,8 +184,10 @@ static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 *







	struct qca_mgmt_ethhdr *mgmt_ethhdr;









	unsigned int real_len;









	struct sk_buff *skb;









	u32 *data2;









	__le32 *data2;









	u32 command;









	u16 hdr;









	int i;



















	skb = dev_alloc_skb(QCA_HDR_MGMT_PKT_LEN);









	if (!skb)








@@ -199,20 +216,32 @@ static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 *







	hdr |= FIELD_PREP(QCA_HDR_XMIT_DP_BIT, BIT(0));









	hdr |= FIELD_PREP(QCA_HDR_XMIT_CONTROL, QCA_HDR_XMIT_TYPE_RW_REG);



















	mgmt_ethhdr->command = FIELD_PREP(QCA_HDR_MGMT_ADDR, reg);









	mgmt_ethhdr->command |= FIELD_PREP(QCA_HDR_MGMT_LENGTH, real_len);









	mgmt_ethhdr->command |= FIELD_PREP(QCA_HDR_MGMT_CMD, cmd);









	mgmt_ethhdr->command |= FIELD_PREP(QCA_HDR_MGMT_CHECK_CODE,









	command = FIELD_PREP(QCA_HDR_MGMT_ADDR, reg);









	command |= FIELD_PREP(QCA_HDR_MGMT_LENGTH, real_len);









	command |= FIELD_PREP(QCA_HDR_MGMT_CMD, cmd);









	command |= FIELD_PREP(QCA_HDR_MGMT_CHECK_CODE,









					   QCA_HDR_MGMT_CHECK_CODE_VAL);



















	put_unaligned_le32(command, &mgmt_ethhdr->command);



















	if (cmd == MDIO_WRITE)









		mgmt_ethhdr->mdio_data = *val;









		put_unaligned_le32(*val, &mgmt_ethhdr->mdio_data);



















	mgmt_ethhdr->hdr = htons(hdr);



















	data2 = skb_put_zero(skb, QCA_HDR_MGMT_DATA2_LEN + QCA_HDR_MGMT_PADDING_LEN);









	if (cmd == MDIO_WRITE && len > QCA_HDR_MGMT_DATA1_LEN)









		memcpy(data2, val + 1, len - QCA_HDR_MGMT_DATA1_LEN);









	if (cmd == MDIO_WRITE && len > QCA_HDR_MGMT_DATA1_LEN) {









		int data_len = min_t(int, QCA_HDR_MGMT_DATA2_LEN,









				     len - QCA_HDR_MGMT_DATA1_LEN);



















		val++;



















		for (i = sizeof(u32); i <= data_len; i += sizeof(u32)) {









			put_unaligned_le32(*val, data2);









			data2++;









			val++;









		}









	}



















	return skb;









}








@@ -220,9 +249,11 @@ static struct sk_buff *qca8k_alloc_mdio_header(enum mdio_cmd cmd, u32 reg, u32 *







static void qca8k_mdio_header_fill_seq_num(struct sk_buff *skb, u32 seq_num)









{









	struct qca_mgmt_ethhdr *mgmt_ethhdr;









	u32 seq;



















	seq = FIELD_PREP(QCA_HDR_MGMT_SEQ_NUM, seq_num);









	mgmt_ethhdr = (struct qca_mgmt_ethhdr *)skb->data;









	mgmt_ethhdr->seq = FIELD_PREP(QCA_HDR_MGMT_SEQ_NUM, seq_num);









	put_unaligned_le32(seq, &mgmt_ethhdr->seq);









}



















static int qca8k_read_eth(struct qca8k_priv *priv, u32 reg, u32 *val, int len)








@@ -1487,9 +1518,9 @@ static void qca8k_mib_autocast_handler(struct dsa_switch *ds, struct sk_buff *sk







	struct qca8k_priv *priv = ds->priv;









	const struct qca8k_mib_desc *mib;









	struct mib_ethhdr *mib_ethhdr;









	int i, mib_len, offset = 0;









	u64 *data;









	__le32 *data2;









	u8 port;









	int i;



















	mib_ethhdr = (struct mib_ethhdr *)skb_mac_header(skb);









	mib_eth_data = &priv->mib_eth_data;








@@ -1501,28 +1532,24 @@ static void qca8k_mib_autocast_handler(struct dsa_switch *ds, struct sk_buff *sk







	if (port != mib_eth_data->req_port)









		goto exit;



















	data = mib_eth_data->data;









	data2 = (__le32 *)skb->data;



















	for (i = 0; i < priv->info->mib_count; i++) {









		mib = &ar8327_mib[i];



















		/* First 3 mib are present in the skb head */









		if (i < 3) {









			data[i] = mib_ethhdr->data[i];









			mib_eth_data->data[i] = get_unaligned_le32(mib_ethhdr->data + i);









			continue;









		}



















		mib_len = sizeof(uint32_t);



















		/* Some mib are 64 bit wide */









		if (mib->size == 2)









			mib_len = sizeof(uint64_t);



















		/* Copy the mib value from packet to the */









		memcpy(data + i, skb->data + offset, mib_len);









			mib_eth_data->data[i] = get_unaligned_le64((__le64 *)data2);









		else









			mib_eth_data->data[i] = get_unaligned_le32(data2);



















		/* Set the offset for the next mib */









		offset += mib_len;









		data2 += mib->size;









	}



















exit:
































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



+6
−5






























Original line number
Diff line number
Diff line







@@ -613,6 +613,7 @@ static int bnxt_dl_reload_up(struct devlink *dl, enum devlink_reload_action acti

















static bool bnxt_nvm_test(struct bnxt *bp, struct netlink_ext_ack *extack)









{









	bool rc = false;









	u32 datalen;









	u16 index;









	u8 *buf;








@@ -632,20 +633,20 @@ static bool bnxt_nvm_test(struct bnxt *bp, struct netlink_ext_ack *extack)

















	if (bnxt_get_nvram_item(bp->dev, index, 0, datalen, buf)) {









		NL_SET_ERR_MSG_MOD(extack, "nvm test vpd read error");









		goto err;









		goto done;









	}



















	if (bnxt_flash_nvram(bp->dev, BNX_DIR_TYPE_VPD, BNX_DIR_ORDINAL_FIRST,









			     BNX_DIR_EXT_NONE, 0, 0, buf, datalen)) {









		NL_SET_ERR_MSG_MOD(extack, "nvm test vpd write error");









		goto err;









		goto done;









	}



















	return true;









	rc = true;



















err:









done:









	kfree(buf);









	return false;









	return rc;









}



















static bool bnxt_dl_selftest_check(struct devlink *dl, unsigned int id,
































drivers/net/ethernet/hisilicon/hns/hnae.c



+3
−1






























Original line number
Diff line number
Diff line







@@ -419,8 +419,10 @@ int hnae_ae_register(struct hnae_ae_dev *hdev, struct module *owner)







	hdev->cls_dev.release = hnae_release;









	(void)dev_set_name(&hdev->cls_dev, "hnae%d", hdev->id);









	ret = device_register(&hdev->cls_dev);









	if (ret)









	if (ret) {









		put_device(&hdev->cls_dev);









		return ret;









	}



















	__module_get(THIS_MODULE);