Commit cbf658dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from Jakub Kicinski:
 "Including fixes from wireless. No known regressions at this point.

  Current release - fix to a fix:

   - eth: Revert "net/mlx5e: Update and set Xon/Xoff upon port speed set"

   - wifi: iwlwifi: pcie: fix byte count table for 7000/8000 devices

   - net: clear sk->sk_ino in sk_set_socket(sk, NULL), fix CRIU

  Previous releases - regressions:

   - bonding: set random address only when slaves already exist

   - rxrpc: fix untrusted unsigned subtract

   - eth:
       - ice: fix Rx page leak on multi-buffer frames
       - mlx5: don't return mlx5_link_info table when speed is unknown

  Previous releases - always broken:

   - tls: make sure to abort the stream if headers are bogus

   - tcp: fix null-deref when using TCP-AO with TCP_REPAIR

   - dpll: fix skipping last entry in clock quality level reporting

   - eth: qed: don't collect too many protection override GRC elements,
     fix memory corruption"

* tag 'net-6.17-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (51 commits)
  octeontx2-pf: Fix use-after-free bugs in otx2_sync_tstamp()
  cnic: Fix use-after-free bugs in cnic_delete_task
  devlink rate: Remove unnecessary 'static' from a couple places
  MAINTAINERS: update sundance entry
  net: liquidio: fix overflow in octeon_init_instr_queue()
  net: clear sk->sk_ino in sk_set_socket(sk, NULL)
  Revert "net/mlx5e: Update and set Xon/Xoff upon port speed set"
  selftests: tls: test skb copy under mem pressure and OOB
  tls: make sure to abort the stream if headers are bogus
  selftest: packetdrill: Add tcp_fastopen_server_reset-after-disconnect.pkt.
  tcp: Clear tcp_sk(sk)->fastopen_rsk in tcp_disconnect().
  octeon_ep: fix VF MAC address lifecycle handling
  selftests: bonding: add vlan over bond testing
  bonding: don't set oif to bond dev when getting NS target destination
  net: rfkill: gpio: Fix crash due to dereferencering uninitialized pointer
  net/mlx5e: Add a miss level for ipsec crypto offload
  net/mlx5e: Harden uplink netdev access against device unbind
  MAINTAINERS: make the DPLL entry cover drivers
  doc/netlink: Fix typos in operation attributes
  igc: don't fail igc_probe() on LED setup error
  ...
parents 86cc796e f8b46871

Documentation/netlink/specs/conntrack.yaml

+4 −5
Original line number Diff line number Diff line
@@ -575,8 +575,8 @@ operations: 
            - nat-dst

            - timeout

            - mark

            - counter-orig

            - counter-reply

            - counters-orig

            - counters-reply

            - use

            - id

            - nat-dst
@@ -591,7 +591,6 @@ operations: 
        request:

          value: 0x101

          attributes:

            - nfgen-family

            - mark

            - filter

            - status
@@ -608,8 +607,8 @@ operations: 
            - nat-dst

            - timeout

            - mark

            - counter-orig

            - counter-reply

            - counters-orig

            - counters-reply

            - use

            - id

            - nat-dst

Documentation/netlink/specs/mptcp_pm.yaml

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ definitions: 
          traffic-patterns it can take a long time until the

          MPTCP_EVENT_ESTABLISHED is sent.

          Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,

          dport, server-side.

          dport, server-side, [flags].

      -

        name: established

        doc: >-

          A MPTCP connection is established (can start new subflows).

          Attributes: token, family, saddr4 | saddr6, daddr4 | daddr6, sport,

          dport, server-side.

          dport, server-side, [flags].

      -

        name: closed

        doc: >-

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -7430,7 +7430,7 @@ S: Supported 
F:	Documentation/devicetree/bindings/dpll/dpll-device.yaml

F:	Documentation/devicetree/bindings/dpll/dpll-pin.yaml

F:	Documentation/driver-api/dpll.rst

F:	drivers/dpll/*

F:	drivers/dpll/

F:	include/linux/dpll.h

F:	include/uapi/linux/dpll.h








@@ -24259,7 +24259,7 @@ F:	Documentation/devicetree/bindings/input/allwinner,sun4i-a10-lradc-keys.yaml







F:	drivers/input/keyboard/sun4i-lradc-keys.c

















SUNDANCE NETWORK DRIVER









M:	Denis Kirjanov <dkirjanov@suse.de>









M:	Denis Kirjanov <kirjanov@gmail.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/dlink/sundance.c

























drivers/dpll/dpll_netlink.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -211,8 +211,8 @@ static int







dpll_msg_add_clock_quality_level(struct sk_buff *msg, struct dpll_device *dpll,









				 struct netlink_ext_ack *extack)









{









	DECLARE_BITMAP(qls, DPLL_CLOCK_QUALITY_LEVEL_MAX + 1) = { 0 };









	const struct dpll_device_ops *ops = dpll_device_ops(dpll);









	DECLARE_BITMAP(qls, DPLL_CLOCK_QUALITY_LEVEL_MAX) = { 0 };









	enum dpll_clock_quality_level ql;









	int ret;


















@@ -221,7 +221,7 @@ dpll_msg_add_clock_quality_level(struct sk_buff *msg, struct dpll_device *dpll,







	ret = ops->clock_quality_level_get(dpll, dpll_priv(dpll), qls, extack);









	if (ret)









		return ret;









	for_each_set_bit(ql, qls, DPLL_CLOCK_QUALITY_LEVEL_MAX)









	for_each_set_bit(ql, qls, DPLL_CLOCK_QUALITY_LEVEL_MAX + 1)









		if (nla_put_u32(msg, DPLL_A_CLOCK_QUALITY_LEVEL, ql))









			return -EMSGSIZE;










































drivers/net/bonding/bond_main.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2132,6 +2132,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,







		memcpy(ss.__data, bond_dev->dev_addr, bond_dev->addr_len);









	} else if (bond->params.fail_over_mac == BOND_FOM_FOLLOW &&









		   BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP &&









		   bond_has_slaves(bond) &&









		   memcmp(slave_dev->dev_addr, bond_dev->dev_addr, bond_dev->addr_len) == 0) {









		/* Set slave to random address to avoid duplicate mac









		 * address in later fail over.








@@ -3355,7 +3356,6 @@ static void bond_ns_send_all(struct bonding *bond, struct slave *slave)







		/* Find out through which dev should the packet go */









		memset(&fl6, 0, sizeof(struct flowi6));









		fl6.daddr = targets[i];









		fl6.flowi6_oif = bond->dev->ifindex;



















		dst = ip6_route_output(dev_net(bond->dev), NULL, &fl6);









		if (dst->error) {