From: Greg Kroah-Hartman Date: Thu, 2 Jul 2026 15:49:28 +0000 (+0200) Subject: 6.18-stable patches X-Git-Tag: v5.10.260~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0c9b2e76c451f3c5765b6b1b7426ca4a3d0ddf1;p=thirdparty%2Fkernel%2Fstable-queue.git 6.18-stable patches added patches: apparmor-advertise-the-tcp-fast-open-fix-is-applied.patch --- diff --git a/queue-6.18/apparmor-advertise-the-tcp-fast-open-fix-is-applied.patch b/queue-6.18/apparmor-advertise-the-tcp-fast-open-fix-is-applied.patch new file mode 100644 index 0000000000..2125258da2 --- /dev/null +++ b/queue-6.18/apparmor-advertise-the-tcp-fast-open-fix-is-applied.patch @@ -0,0 +1,39 @@ +From 2f6701a5ce6257ae7a64ddc6d89d0a08d2a034f8 Mon Sep 17 00:00:00 2001 +From: John Johansen +Date: Mon, 22 Jun 2026 16:34:13 -0700 +Subject: apparmor: advertise the tcp fast open fix is applied + +From: John Johansen + +commit 2f6701a5ce6257ae7a64ddc6d89d0a08d2a034f8 upstream. + +The fix for tcp-fast-open ensures that the connect permission is being +mediated correctly but it didn't add an artifact to the feature set to +advertise the fix is available. Add an artifact so that the test suite +can identify if the fix has not been properly applied or a new +unexpected regression has occurred. + +Fixes: 4d587cd8a7215 ("apparmor: mediate the implicit connect of TCP fast open sendmsg") +Signed-off-by: John Johansen +Signed-off-by: Greg Kroah-Hartman +--- + security/apparmor/net.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/security/apparmor/net.c ++++ b/security/apparmor/net.c +@@ -22,12 +22,14 @@ + + struct aa_sfs_entry aa_sfs_entry_network[] = { + AA_SFS_FILE_STRING("af_mask", AA_SFS_AF_MASK), ++ AA_SFS_FILE_BOOLEAN("tcp-fast-open", 1), + { } + }; + + struct aa_sfs_entry aa_sfs_entry_networkv9[] = { + AA_SFS_FILE_STRING("af_mask", AA_SFS_AF_MASK), + AA_SFS_FILE_BOOLEAN("af_unix", 1), ++ AA_SFS_FILE_BOOLEAN("tcp-fast-open", 1), + { } + }; + diff --git a/queue-6.18/series b/queue-6.18/series index 3cc0d625d4..22bfb61651 100644 --- a/queue-6.18/series +++ b/queue-6.18/series @@ -105,3 +105,4 @@ nfs-prevent-resource-leak-in-nfs_alloc_server.patch ksmbd-fix-out-of-bounds-read-in-smb_check_perm_dacl.patch serial-8250_dw-unregister-8250-port-if-clk_notifier_register-fails.patch net-tcp-ao-fix-use-after-free-of-key-in-del_async-path.patch +apparmor-advertise-the-tcp-fast-open-fix-is-applied.patch