]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'nfc-7.1-rc6' of https://codeberg.org/linux-nfc/linux
authorJakub Kicinski <kuba@kernel.org>
Wed, 27 May 2026 01:32:34 +0000 (18:32 -0700)
committerJakub Kicinski <kuba@kernel.org>
Wed, 27 May 2026 01:32:34 +0000 (18:32 -0700)
David Heidelberg says:

====================
nfc pull request for net:

Code improvements
 - llcp: Fix use-after-free in llcp_sock_release()
 - llcp: Fix use-after-free race in nfc_llcp_recv_cc()
 - hci: fix out-of-bounds read in HCP header parsing
Regression fixes:
 - nxp-nci: i2c: use rising-edge IRQ on ACPI systems

Signed-off-by: David Heidelberg <david@ixit.cz>
* tag 'nfc-7.1-rc6' of https://codeberg.org/linux-nfc/linux:
  nfc: nxp-nci: i2c: use rising-edge IRQ on ACPI systems
  nfc: hci: fix out-of-bounds read in HCP header parsing
  nfc: llcp: Fix use-after-free race in nfc_llcp_recv_cc()
  nfc: llcp: Fix use-after-free in llcp_sock_release()
====================

Link: https://patch.msgid.link/217c0646-8a30-4037-b613-580c2b189729@ixit.cz
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

Trivial merge