FAILED: patch "[PATCH] landlock: Add the errata interface" failed to apply to 6.1-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 6.1-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
git checkout FETCH_HEAD
git cherry-pick -x 15383a0d63dbcd63dc7e8d9ec1bf3a0f7ebf64ac
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025041712-remark-lyricist-a86b@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 15383a0d63dbcd63dc7e8d9ec1bf3a0f7ebf64ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= <[email protected]>
Date: Tue, 18 Mar 2025 17:14:37 +0100
Subject: [PATCH] landlock: Add the errata interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some fixes may require user space to check if they are applied on the running kernel before using a specific feature. For instance, this applies when a restriction was previously too restrictive and is now getting relaxed (e.g. for compatibility reasons). However, non-visible changes for legitimate use (e.g. security fixes) do not require an erratum.
Because fixes are backported down to a specific Landlock ABI, we need a way to avoid cherry-pick conflicts. The solution is to only update a file related to the lower ABI impacted by this issue. All the ABI files are then used to create a bitmask of fixes.
The new errata interface is similar to the one used to get the supported Landlock ABI version, but it returns a bitmask instead because the order of fixes may not match the order of versions, and not all fixes may apply to all versions.
The actual errata will come with dedicated commits. The description is not actually used in the code but serves as documentation.
Create the landlock_abi_version symbol and use its value to check errata consistency.
Update test_base's create_ruleset_checks_ordering tests and add errata tests.
This commit is backportable down to the first version of Landlock.
include/uapi/linux/landlock.h +2 -0
@@ -57,9 +57,11 @@ struct landlock_ruleset_attr {* * - %LANDLOCK_CREATE_RULESET_VERSION: Get the highest supported Landlock ABI * version. +* - %LANDLOCK_CREATE_RULESET_ERRATA: Get a bitmask of fixed issues. */ /* clang-format off */ #define LANDLOCK_CREATE_RULESET_VERSION (1U << 0) +#define LANDLOCK_CREATE_RULESET_ERRATA (1U << 1)/* clang-format on */ /**
security/landlock/errata.h new file +87 -0
87 lines not on this page · raw message
security/landlock/setup.c +30 -0
@@ -6,12 +6,14 @@* Copyright © 2018-2020 ANSSI */ +#include <linux/bits.h> #include <linux/init.h> #include <linux/lsm_hooks.h> #include <uapi/linux/lsm.h> #include "common.h" #include "cred.h" +#include "errata.h" #include "fs.h" #include "net.h" #include "setup.h"
@@ -31,8 +33,36 @@ struct lsm_blob_sizes landlock_blob_sizes __ro_after_init = { .lbs_superblock = sizeof(struct landlock_superblock_security), }; +int landlock_errata__ro_after_init ; + +static void __init compute_errata (void ) +{ +size_t i; + +#ifndef __has_include +/* +* This is a safeguard to make sure the compiler implements +* __has_include (see errata.h). +*/ +WARN_ON_ONCE (1 ); +return ; +#endif + +for (i =0 ; landlock_errata_init[i].number; i++) { +const int prev_errata = landlock_errata; + +if (WARN_ON_ONCE (landlock_errata_init[i].abi > + landlock_abi_version)) +continue ; + + landlock_errata |=BIT (landlock_errata_init[i].number -1 ); +WARN_ON_ONCE (prev_errata == landlock_errata); + } +} +static int __init landlock_init (void ) { +compute_errata ();landlock_add_cred_hooks ();landlock_add_task_hooks ();landlock_add_fs_hooks ();
security/landlock/setup.h +3 -0
@@ -11,7 +11,10 @@#include <linux/lsm_hooks.h> +extern const int landlock_abi_version; +extern bool landlock_initialized; +extern int landlock_errata;extern struct lsm_blob_sizes landlock_blob_sizes;extern const struct lsm_id landlock_lsmid;
security/landlock/syscalls.c +18 -4
@@ -160,7 +160,9 @@ static const struct file_operations ruleset_fops = {* the new ruleset. * @size: Size of the pointed &struct landlock_ruleset_attr (needed for * backward and forward compatibility). -* @flags: Supported value: %LANDLOCK_CREATE_RULESET_VERSION. +* @flags: Supported value: +* - %LANDLOCK_CREATE_RULESET_VERSION +* - %LANDLOCK_CREATE_RULESET_ERRATA * * This system call enables to create a new Landlock ruleset, and returns the * related file descriptor on success.
@@ -169,6 +171,10 @@ static const struct file_operations ruleset_fops = {* 0, then the returned value is the highest supported Landlock ABI version * (starting at 1). * +* If @flags is %LANDLOCK_CREATE_RULESET_ERRATA and @attr is NULL and @size is +* 0, then the returned value is a bitmask of fixed issues for the current +* Landlock ABI version. +* * Possible returned errors are: * * - %EOPNOTSUPP: Landlock is supported by the kernel but disabled at boot time;
@@ -192,9 +198,15 @@ SYSCALL_DEFINE3(landlock_create_ruleset,return -EOPNOTSUPP ;if (flags) { -if ((flags ==LANDLOCK_CREATE_RULESET_VERSION ) && !attr && - !size) -return LANDLOCK_ABI_VERSION ; +if (attr || size) +return -EINVAL ; + +if (flags ==LANDLOCK_CREATE_RULESET_VERSION ) +return landlock_abi_version; + +if (flags ==LANDLOCK_CREATE_RULESET_ERRATA ) +return landlock_errata; +return -EINVAL ; }
@@ -235,6 +247,8 @@ SYSCALL_DEFINE3(landlock_create_ruleset,return ruleset_fd; } +const int landlock_abi_version =LANDLOCK_ABI_VERSION ; +/* * Returns an owned ruleset from a FD. It is thus needed to call * landlock_put_ruleset() on the return value.
tools/testing/selftests/landlock/base_test.c +45 -1
55 lines not on this page · raw message
Mickaël Salaün
maintainerPATCH 1/1 landlock: Add the errata interface
Some fixes may require user space to check if they are applied on the running kernel before using a specific feature. For instance, this applies when a restriction was previously too restrictive and is now getting relaxed (e.g. for compatibility reasons). However, non-visible changes for legitimate use (e.g. security fixes) do not require an erratum.
Because fixes are backported down to a specific Landlock ABI, we need a way to avoid cherry-pick conflicts. The solution is to only update a file related to the lower ABI impacted by this issue. All the ABI files are then used to create a bitmask of fixes.
The new errata interface is similar to the one used to get the supported Landlock ABI version, but it returns a bitmask instead because the order of fixes may not match the order of versions, and not all fixes may apply to all versions.
The actual errata will come with dedicated commits. The description is not actually used in the code but serves as documentation.
Create the landlock_abi_version symbol and use its value to check errata consistency.
Update test_base's create_ruleset_checks_ordering tests and add errata tests.
This commit is backportable down to the first version of Landlock.
--- include/uapi/linux/landlock.h | 2 + security/landlock/errata.h | 87 ++++++++++++++++++++ security/landlock/setup.c | 30 +++++++ security/landlock/setup.h | 3 + security/landlock/syscalls.c | 22 ++++- tools/testing/selftests/landlock/base_test.c | 46 ++++++++++- 6 files changed, 185 insertions(+), 5 deletions(-) create mode 100644 security/landlock/errata.h
include/uapi/linux/landlock.h +2 -0
@@ -38,9 +38,11 @@ struct landlock_ruleset_attr {* * - %LANDLOCK_CREATE_RULESET_VERSION: Get the highest supported Landlock ABI * version. +* - %LANDLOCK_CREATE_RULESET_ERRATA: Get a bitmask of fixed issues. */ /* clang-format off */ #define LANDLOCK_CREATE_RULESET_VERSION (1U << 0) +#define LANDLOCK_CREATE_RULESET_ERRATA (1U << 1)/* clang-format on */ /**
security/landlock/errata.h new file +87 -0
87 lines not on this page · raw message
security/landlock/setup.c +30 -0
@@ -6,11 +6,13 @@* Copyright © 2018-2020 ANSSI */ +#include <linux/bits.h> #include <linux/init.h> #include <linux/lsm_hooks.h> #include "common.h" #include "cred.h" +#include "errata.h" #include "fs.h" #include "ptrace.h" #include "setup.h"
@@ -23,8 +25,36 @@ struct lsm_blob_sizes landlock_blob_sizes __lsm_ro_after_init = { .lbs_superblock = sizeof(struct landlock_superblock_security), }; +int landlock_errata__ro_after_init ; + +static void __init compute_errata (void ) +{ +size_t i; + +#ifndef __has_include +/* +* This is a safeguard to make sure the compiler implements +* __has_include (see errata.h). +*/ +WARN_ON_ONCE (1 ); +return ; +#endif + +for (i =0 ; landlock_errata_init[i].number; i++) { +const int prev_errata = landlock_errata; + +if (WARN_ON_ONCE (landlock_errata_init[i].abi > + landlock_abi_version)) +continue ; + + landlock_errata |=BIT (landlock_errata_init[i].number -1 ); +WARN_ON_ONCE (prev_errata == landlock_errata); + } +} +static int __init landlock_init (void ) { +compute_errata ();landlock_add_cred_hooks ();landlock_add_ptrace_hooks ();landlock_add_fs_hooks ();
security/landlock/setup.h +3 -0
@@ -11,7 +11,10 @@#include <linux/lsm_hooks.h> +extern const int landlock_abi_version; +extern bool landlock_initialized; +extern int landlock_errata;extern struct lsm_blob_sizes landlock_blob_sizes;
security/landlock/syscalls.c +18 -4
@@ -150,7 +150,9 @@ static const struct file_operations ruleset_fops = {* the new ruleset. * @size: Size of the pointed &struct landlock_ruleset_attr (needed for * backward and forward compatibility). -* @flags: Supported value: %LANDLOCK_CREATE_RULESET_VERSION. +* @flags: Supported value: +* - %LANDLOCK_CREATE_RULESET_VERSION +* - %LANDLOCK_CREATE_RULESET_ERRATA * * This system call enables to create a new Landlock ruleset, and returns the * related file descriptor on success.
@@ -159,6 +161,10 @@ static const struct file_operations ruleset_fops = {* 0, then the returned value is the highest supported Landlock ABI version * (starting at 1). * +* If @flags is %LANDLOCK_CREATE_RULESET_ERRATA and @attr is NULL and @size is +* 0, then the returned value is a bitmask of fixed issues for the current +* Landlock ABI version. +* * Possible returned errors are: * * - %EOPNOTSUPP: Landlock is supported by the kernel but disabled at boot time;
@@ -181,9 +187,15 @@ SYSCALL_DEFINE3(landlock_create_ruleset,return -EOPNOTSUPP ;if (flags) { -if ((flags ==LANDLOCK_CREATE_RULESET_VERSION ) && !attr && - !size) -return LANDLOCK_ABI_VERSION ; +if (attr || size) +return -EINVAL ; + +if (flags ==LANDLOCK_CREATE_RULESET_VERSION ) +return landlock_abi_version; + +if (flags ==LANDLOCK_CREATE_RULESET_ERRATA ) +return landlock_errata; +return -EINVAL ; }
@@ -213,6 +225,8 @@ SYSCALL_DEFINE3(landlock_create_ruleset,return ruleset_fd; } +const int landlock_abi_version =LANDLOCK_ABI_VERSION ; +/* * Returns an owned ruleset from a FD. It is thus needed to call * landlock_put_ruleset() on the return value.
tools/testing/selftests/landlock/base_test.c +45 -1
55 lines not on this page · raw message
Signature · 1 line
2.49.0
Sasha Levin
maintainerRe: [PATCH 6.1.y] landlock: Add the errata interface
[ Sasha's backport helper bot ]
Hi,
Summary of potential issues:
⚠️ Found matching upstream commit but patch is missing proper reference to it
Found matching upstream commit: 15383a0d63dbcd63dc7e8d9ec1bf3a0f7ebf64ac
Status in newer kernel trees:
6.14.y | Present (different SHA1: 728f62bff8a0) 6.13.y | Present (different SHA1: be73220526b7) 6.12.y | Present (different SHA1: ed390ad1458c)
6.6.y | Not found
Note: The patch differs from the upstream commit:
---
1: 15383a0d63dbc ! 1: 7630c5f930b8b landlock: Add the errata interface
@@ Commit message
Cc: Günther Noack <[email protected]>
Cc: [email protected]
Link: https://lore.kernel.org/r/[email protected]
+ (cherry picked from commit 15383a0d63dbcd63dc7e8d9ec1bf3a0f7ebf64ac)
Signed-off-by: Mickaël Salaün <[email protected]>
## include/uapi/linux/landlock.h ##
@@ security/landlock/setup.c
+#include <linux/bits.h>
#include <linux/init.h>
#include <linux/lsm_hooks.h>
- #include <uapi/linux/lsm.h>
#include "common.h"
#include "cred.h"
+#include "errata.h"
#include "fs.h"
- #include "net.h"
+ #include "ptrace.h"
#include "setup.h"
-@@ security/landlock/setup.c: struct lsm_blob_sizes landlock_blob_sizes __ro_after_init = {
+@@ security/landlock/setup.c: struct lsm_blob_sizes landlock_blob_sizes __lsm_ro_after_init = {
.lbs_superblock = sizeof(struct landlock_superblock_security),
};
@@ security/landlock/setup.c: struct lsm_blob_sizes landlock_blob_sizes __ro_after_
{
+ compute_errata();
landlock_add_cred_hooks();
- landlock_add_task_hooks();
+ landlock_add_ptrace_hooks();
landlock_add_fs_hooks();
## security/landlock/setup.h ##
@@ security/landlock/setup.h
+extern int landlock_errata;
extern struct lsm_blob_sizes landlock_blob_sizes;
- extern const struct lsm_id landlock_lsmid;
+
## security/landlock/syscalls.c ##
@@ security/landlock/syscalls.c: static const struct file_operations ruleset_fops = {---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.1.y | Success | Success |