Commit 50fb587e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Current release - regressions:

   - net: fix skb leak in __skb_tstamp_tx()

   - eth: mtk_eth_soc: fix QoS on DSA MAC on non MTK_NETSYS_V2 SoCs

  Current release - new code bugs:

   - handshake:
      - fix sock->file allocation
      - fix handshake_dup() ref counting

   - bluetooth:
      - fix potential double free caused by hci_conn_unlink
      - fix UAF in hci_conn_hash_flush

  Previous releases - regressions:

   - core: fix stack overflow when LRO is disabled for virtual
     interfaces

   - tls: fix strparser rx issues

   - bpf:
      - fix many sockmap/TCP related issues
      - fix a memory leak in the LRU and LRU_PERCPU hash maps
      - init the offload table earlier

   - eth: mlx5e:
      - do as little as possible in napi poll when budget is 0
      - fix using eswitch mapping in nic mode
      - fix deadlock in tc route query code

  Previous releases - always broken:

   - udplite: fix NULL pointer dereference in __sk_mem_raise_allocated()

   - raw: fix output xfrm lookup wrt protocol

   - smc: reset connection when trying to use SMCRv2 fails

   - phy: mscc: enable VSC8501/2 RGMII RX clock

   - eth: octeontx2-pf: fix TSOv6 offload

   - eth: cdc_ncm: deal with too low values of dwNtbOutMaxSize"

* tag 'net-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (79 commits)
  udplite: Fix NULL pointer dereference in __sk_mem_raise_allocated().
  net: phy: mscc: enable VSC8501/2 RGMII RX clock
  net: phy: mscc: remove unnecessary phydev locking
  net: phy: mscc: add support for VSC8501
  net: phy: mscc: add VSC8502 to MODULE_DEVICE_TABLE
  net/handshake: Enable the SNI extension to work properly
  net/handshake: Unpin sock->file if a handshake is cancelled
  net/handshake: handshake_genl_notify() shouldn't ignore @flags
  net/handshake: Fix uninitialized local variable
  net/handshake: Fix handshake_dup() ref counting
  net/handshake: Remove unneeded check from handshake_dup()
  ipv6: Fix out-of-bounds access in ipv6_find_tlv()
  net: ethernet: mtk_eth_soc: fix QoS on DSA MAC on non MTK_NETSYS_V2 SoCs
  docs: netdev: document the existence of the mail bot
  net: fix skb leak in __skb_tstamp_tx()
  r8169: Use a raw_spinlock_t for the register locks.
  page_pool: fix inconsistency for page_pool_ring_[un]lock()
  bpf, sockmap: Test progs verifier error with latest clang
  bpf, sockmap: Test FIONREAD returns correct bytes in rx buffer with drops
  bpf, sockmap: Test FIONREAD returns correct bytes in rx buffer
  ...
parents eb03e318 ad42a35b

Documentation/netlink/specs/handshake.yaml

+4 −0
Original line number Diff line number Diff line
@@ -68,6 +68,9 @@ attribute-sets: 
        type: nest

        nested-attributes: x509

        multi-attr: true

      -

        name: peername

        type: string

  -

    name: done

    attributes:
@@ -105,6 +108,7 @@ operations: 
            - auth-mode

            - peer-identity

            - certificate

            - peername

    -

      name: done

      doc: Handler reports handshake completion

Documentation/networking/tls-handshake.rst

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ fills in a structure that contains the parameters of the request: 
        struct socket   *ta_sock;

        tls_done_func_t ta_done;

        void            *ta_data;

        const char      *ta_peername;

        unsigned int    ta_timeout_ms;

        key_serial_t    ta_keyring;

        key_serial_t    ta_my_cert;
@@ -71,6 +72,10 @@ instantiated a struct file in sock->file. 
has completed. Further explanation of this function is in the "Handshake

Completion" sesction below.



The consumer can provide a NUL-terminated hostname in the @ta_peername

field that is sent as part of ClientHello. If no peername is provided,

the DNS hostname associated with the server's IP address is used instead.



The consumer can fill in the @ta_timeout_ms field to force the servicing

handshake agent to exit after a number of milliseconds. This enables the

socket to be fully closed once both the kernel and the handshake agent

Documentation/process/maintainer-netdev.rst

+26 −7
Original line number Diff line number Diff line
@@ -127,13 +127,32 @@ the value of ``Message-ID`` to the URL above. 
Updating patch status

~~~~~~~~~~~~~~~~~~~~~



It may be tempting to help the maintainers and update the state of your

own patches when you post a new version or spot a bug. Please **do not**

do that.

Interfering with the patch status on patchwork will only cause confusion. Leave

it to the maintainer to figure out what is the most recent and current

version that should be applied. If there is any doubt, the maintainer

will reply and ask what should be done.

Contributors and reviewers do not have the permissions to update patch

state directly in patchwork. Patchwork doesn't expose much information

about the history of the state of patches, therefore having multiple

people update the state leads to confusion.



Instead of delegating patchwork permissions netdev uses a simple mail

bot which looks for special commands/lines within the emails sent to

the mailing list. For example to mark a series as Changes Requested

one needs to send the following line anywhere in the email thread::



  pw-bot: changes-requested



As a result the bot will set the entire series to Changes Requested.

This may be useful when author discovers a bug in their own series

and wants to prevent it from getting applied.



The use of the bot is entirely optional, if in doubt ignore its existence

completely. Maintainers will classify and update the state of the patches

themselves. No email should ever be sent to the list with the main purpose

of communicating with the bot, the bot commands should be seen as metadata.



The use of the bot is restricted to authors of the patches (the ``From:``

header on patch submission and command must match!), maintainers themselves

and a handful of senior reviewers. Bot records its activity here:



  https://patchwork.hopto.org/pw-bot.html



Review timelines

~~~~~~~~~~~~~~~~

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8153,6 +8153,7 @@ F: include/linux/spi/spi-fsl-dspi.h 








FREESCALE ENETC ETHERNET DRIVERS









M:	Claudiu Manoil <claudiu.manoil@nxp.com>









M:	Vladimir Oltean <vladimir.oltean@nxp.com>









L:	netdev@vger.kernel.org









S:	Maintained









F:	drivers/net/ethernet/freescale/enetc/
































drivers/bluetooth/btnxpuart.c



+3
−3






























Original line number
Diff line number
Diff line







@@ -1319,17 +1319,17 @@ static void nxp_serdev_remove(struct serdev_device *serdev)







	hci_free_dev(hdev);









}



















static struct btnxpuart_data w8987_data = {









static struct btnxpuart_data w8987_data __maybe_unused = {









	.helper_fw_name = NULL,









	.fw_name = FIRMWARE_W8987,









};



















static struct btnxpuart_data w8997_data = {









static struct btnxpuart_data w8997_data __maybe_unused = {









	.helper_fw_name = FIRMWARE_HELPER,









	.fw_name = FIRMWARE_W8997,









};



















static const struct of_device_id nxpuart_of_match_table[] = {









static const struct of_device_id nxpuart_of_match_table[] __maybe_unused = {









	{ .compatible = "nxp,88w8987-bt", .data = &w8987_data },









	{ .compatible = "nxp,88w8997-bt", .data = &w8997_data },









	{ }