Skip to content

Commit 2eb6cec

Browse files
committed
landlock: Prepare to add second errata
JIRA: https://issues.redhat.com/browse/RHEL-125143 Upstream Status: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git commit 6d9ac5e Author: Mickaël Salaün <mic@digikod.net> Date: Tue Mar 18 17:14:39 2025 +0100 landlock: Prepare to add second errata Potentially include errata for Landlock ABI v5 (Linux 6.10) and v6 (Linux 6.12). That will be useful for the following signal scoping erratum. As explained in errata.h, this commit should be backportable without conflict down to ABI v5. It must then not include the errata/abi-6.h file. Fixes: 54a6e6b ("landlock: Add signal scoping") Cc: Günther Noack <gnoack@google.com> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20250318161443.279194-5-mic@digikod.net Signed-off-by: Mickaël Salaün <mic@digikod.net> Signed-off-by: Štěpán Horáček <shoracek@redhat.com>
1 parent 10d9fec commit 2eb6cec

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

security/landlock/errata.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@ static const struct landlock_erratum landlock_errata_init[] __initconst = {
6363
#endif
6464
#undef LANDLOCK_ERRATA_ABI
6565

66+
#define LANDLOCK_ERRATA_ABI 5
67+
#if __has_include("errata/abi-5.h")
68+
#include "errata/abi-5.h"
69+
#endif
70+
#undef LANDLOCK_ERRATA_ABI
71+
72+
#define LANDLOCK_ERRATA_ABI 6
73+
#if __has_include("errata/abi-6.h")
74+
#include "errata/abi-6.h"
75+
#endif
76+
#undef LANDLOCK_ERRATA_ABI
77+
6678
/*
6779
* For each new erratum, we need to include all the ABI files up to the impacted
6880
* ABI to make all potential future intermediate errata easy to backport.

0 commit comments

Comments
 (0)