diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-04-30 01:42:10 -0400 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@strace.io> | 2022-05-27 12:06:09 +0000 |
| commit | e860eae1e8d8923599a78807e6ae49394a717b42 (patch) | |
| tree | 6ab1d02c726c0d91f0ae353673a318943e9639ee | |
| parent | dda44d34e5fc0878e6ba3e08c6f297522758bae6 (diff) | |
| download | strace-e860eae1e8d8923599a78807e6ae49394a717b42.tar.gz | |
landlock: update expected string
Test failures were picked up in the yocto 5.15.36 -stable testing.
Kernel commit:
commit 3d4b396a616d0d67bf95d6823ad1197f6247292e
Author: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon Oct 11 15:37:04 2021 +0200
landlock: Use square brackets around "landlock-ruleset"
commit aea0b9f2486da8497f35c7114b764bf55e17c7ea upstream.
Make the name of the anon inode fd "[landlock-ruleset]" instead of
"landlock-ruleset". This is minor but most anon inode fds already
carry square brackets around their name:
[eventfd]
[eventpoll]
[fanotify]
[fscontext]
[io_uring]
[pidfd]
[signalfd]
[timerfd]
[userfaultfd]
For the sake of consistency lets do the same for the landlock-ruleset anon
inode fd that comes with landlock. We did the same in
1cdc415f1083 ("uapi, fsopen: use square brackets around "fscontext" [ver #2]")
for the new mount api.
Cc: linux-security-module@vger.kernel.org
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
Link: https://lore.kernel.org/r/20211011133704.1704369-1-brauner@kernel.org
Cc: stable@vger.kernel.org
Signed-off-by: Mickaël Salaün <mic@linux.microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Changed the format of the landlock ruleset. We need to update the strace
expected string to match.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
| -rw-r--r-- | tests/landlock_create_ruleset-y.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/landlock_create_ruleset-y.c b/tests/landlock_create_ruleset-y.c index a30966b09..50e19c2d5 100644 --- a/tests/landlock_create_ruleset-y.c +++ b/tests/landlock_create_ruleset-y.c @@ -1,4 +1,4 @@ -#define FD_PATH "<anon_inode:landlock-ruleset>" +#define FD_PATH "<anon_inode:[landlock-ruleset]>" #define SKIP_IF_PROC_IS_UNAVAILABLE skip_if_unavailable("/proc/self/fd/") #include "landlock_create_ruleset.c" |