1From d0dae2fb30b907bc9bf70382f37c9e00207ae036 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Sat, 30 Apr 2022 01:09:42 -0400
4Subject: [PATCH] landlock: update expected string
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Kernel commit:
10
11  commit 3d4b396a616d0d67bf95d6823ad1197f6247292e
12  Author: Christian Brauner <christian.brauner@ubuntu.com>
13  Date:   Mon Oct 11 15:37:04 2021 +0200
14
15      landlock: Use square brackets around "landlock-ruleset"
16
17      commit aea0b9f2486da8497f35c7114b764bf55e17c7ea upstream.
18
19      Make the name of the anon inode fd "[landlock-ruleset]" instead of
20      "landlock-ruleset". This is minor but most anon inode fds already
21      carry square brackets around their name:
22
23          [eventfd]
24          [eventpoll]
25          [fanotify]
26          [fscontext]
27          [io_uring]
28          [pidfd]
29          [signalfd]
30          [timerfd]
31          [userfaultfd]
32
33      For the sake of consistency lets do the same for the landlock-ruleset anon
34      inode fd that comes with landlock. We did the same in
35      1cdc415f1083 ("uapi, fsopen: use square brackets around "fscontext" [ver #2]")
36      for the new mount api.
37
38      Cc: linux-security-module@vger.kernel.org
39      Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
40      Link: https://lore.kernel.org/r/20211011133704.1704369-1-brauner@kernel.org
41      Cc: stable@vger.kernel.org
42      Signed-off-by: Mickaël Salaün <mic@linux.microsoft.com>
43      Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
44
45Changed the format of the landlock tracing. We need to update the strace
46expected string to match.
47
48Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2022-April/011064.html]
49
50Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
51---
52 tests/landlock_create_ruleset-y.c | 2 +-
53 1 file changed, 1 insertion(+), 1 deletion(-)
54
55diff --git a/tests/landlock_create_ruleset-y.c b/tests/landlock_create_ruleset-y.c
56index a30966b..50e19c2 100644
57--- a/tests/landlock_create_ruleset-y.c
58+++ b/tests/landlock_create_ruleset-y.c
59@@ -1,4 +1,4 @@
60-#define FD_PATH "<anon_inode:landlock-ruleset>"
61+#define FD_PATH "<anon_inode:[landlock-ruleset]>"
62 #define SKIP_IF_PROC_IS_UNAVAILABLE skip_if_unavailable("/proc/self/fd/")
63
64 #include "landlock_create_ruleset.c"
65--
662.19.1
67
68