Commit 66182ca8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Previous releases - regressions:

   - ethtool: fix NULL pointer dereference in phy_reply_size

   - netfilter:
      - allocate hook ops while under mutex
      - close dangling table module init race
      - restore nf_conntrack helper propagation via expectation

   - tcp:
      - fix potential UAF in reqsk_timer_handler().
      - fix out-of-bounds access for twsk in tcp_ao_established_key().

   - vsock: fix empty payload in tap skb for non-linear buffers

   - hsr: fix NULL pointer dereference in hsr_get_node_data()

   - eth:
      - cortina: fix RX drop accounting
      - ice: fix locking in ice_dcb_rebuild()

  Previous releases - always broken:

   - napi: avoid gro timer misfiring at end of busypoll

   - sched:
      - dualpi2: initialize timer earlier in dualpi2_init()
      - sch_cbs: Call qdisc_reset for child qdisc

   - shaper:
      - fix ordering issue in net_shaper_commit()
      - reject handle IDs exceeding internal bit-width

   - ipv6: flowlabel: enforce per-netns limit for unprivileged callers

   - tls: fix off-by-one in sg_chain entry count for wrapped sk_msg ring

   - smc: avoid NULL deref of conn->lnk in smc_msg_event tracepoint

   - sctp: revalidate list cursor after sctp_sendmsg_to_asoc() in SCTP_SENDALL

   - batman-adv:
      - reject new tp_meter sessions during teardown
      - purge non-released claims

   - eth:
      - i40e: cleanup PTP registration on probe failure
      - idpf: fix double free and use-after-free in aux device error paths
      - ena: fix potential use-after-free in get_timestamp"

* tag 'net-7.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (88 commits)
  net: phy: DP83TC811: add reading of abilities
  net: tls: prevent chain-after-chain in plain text SG
  net: tls: fix off-by-one in sg_chain entry count for wrapped sk_msg ring
  net/smc: reject CHID-0 ACCEPT that matches an empty ism_dev slot
  macsec: use rcu_work to defer TX SA crypto cleanup out of softirq
  macsec: use rcu_work to defer RX SA crypto cleanup out of softirq
  macsec: introduce dedicated workqueue for SA crypto cleanup
  net: net_failover: Fix the deadlock in slave register
  MAINTAINERS: update atlantic driver maintainer
  selftests/tc-testing: Add QFQ/CBS qlen underflow test
  net/sched: sch_cbs: Call qdisc_reset for child qdisc
  FDDI: defza: Sanitise the reset safety timer
  net: ethernet: ravb: Do not check URAM suspension when WoL is active
  ethtool: fix ethnl_bitmap32_not_zero() bit interval semantics
  net/smc: avoid NULL deref of conn->lnk in smc_msg_event tracepoint
  net/smc: fix sleep-inside-lock in __smc_setsockopt() causing local DoS
  net: atm: fix skb leak in sigd_send() default branch
  net: ethtool: phy: avoid NULL deref when PHY driver is unbound
  net: atlantic: preserve PCI wake-from-D3 on shutdown when WOL enabled
  net: shaper: reject QUEUE scope handle with missing id
  ...
parents eb544151 c78bdba7

Documentation/netlink/genetlink-c.yaml

+9 −0
Original line number Diff line number Diff line
@@ -69,6 +69,15 @@ properties: 
        header:

          description: For C-compatible languages, header which already defines this value.

          type: string

        scope:

          description: |

            Visibility of this definition. "uapi" (default) renders into

            the uAPI header, "kernel" renders into the kernel-side

            generated header, "user" renders into the user-side

            generated header. When combined with `header:`, the

            definition is not rendered, and the named header is

            included only by code matching the scope.

          enum: [ uapi, kernel, user ]

        type:

          enum: [ const, enum, flags ]

        doc:

Documentation/netlink/genetlink-legacy.yaml

+9 −0
Original line number Diff line number Diff line
@@ -83,6 +83,15 @@ properties: 
        header:

          description: For C-compatible languages, header which already defines this value.

          type: string

        scope:

          description: |

            Visibility of this definition. "uapi" (default) renders into

            the uAPI header, "kernel" renders into the kernel-side

            generated header, "user" renders into the user-side

            generated header. When combined with `header:`, the

            definition is not rendered, and the named header is

            included only by code matching the scope.

          enum: [ uapi, kernel, user ]

        type:

          enum: [ const, enum, flags, struct ] # Trim

        doc:

Documentation/netlink/genetlink.yaml

+9 −0
Original line number Diff line number Diff line
@@ -55,6 +55,15 @@ properties: 
        header:

          description: For C-compatible languages, header which already defines this value.

          type: string

        scope:

          description: |

            Visibility of this definition. "uapi" (default) renders into

            the uAPI header, "kernel" renders into the kernel-side

            generated header, "user" renders into the user-side

            generated header. When combined with `header:`, the

            definition is not rendered, and the named header is

            included only by code matching the scope.

          enum: [ uapi, kernel, user ]

        type:

          enum: [ const, enum, flags ]

        doc:

Documentation/netlink/netlink-raw.yaml

+9 −0
Original line number Diff line number Diff line
@@ -87,6 +87,15 @@ properties: 
        header:

          description: For C-compatible languages, header which already defines this value.

          type: string

        scope:

          description: |

            Visibility of this definition. "uapi" (default) renders into

            the uAPI header, "kernel" renders into the kernel-side

            generated header, "user" renders into the user-side

            generated header. When combined with `header:`, the

            definition is not rendered, and the named header is

            included only by code matching the scope.

          enum: [ uapi, kernel, user ]

        type:

          enum: [ const, enum, flags, struct ] # Trim

        doc:

Documentation/netlink/specs/net_shaper.yaml

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,11 @@ doc: | 
  @cap-get operation.



definitions:

  -

    type: const

    name: max-handle-id

    value: 0x3fffffe

    scope: kernel

  -

    type: enum

    name: scope
@@ -140,6 +145,8 @@ attribute-sets: 
      -

        name: id

        type: u32

        checks:

          max: max-handle-id

        doc: |

          Numeric identifier of a shaper. The id semantic depends on

          the scope. For @queue scope it's the queue id and for @node