]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit
strace: fix ptest failure in landlock
authorBruce Ashfield <bruce.ashfield@gmail.com>
Sat, 30 Apr 2022 21:33:54 +0000 (17:33 -0400)
committerSteve Sakoman <steve@sakoman.com>
Mon, 9 May 2022 14:01:07 +0000 (04:01 -1000)
commit0268bc1ed04212acdb5b08e57334ed367042c1a2
tree0acacd5a620a6ecc1a56a19151a19d0d23601333
parentccd27ea8b8e179b7eb0526ed1416ca674c9d295e
strace: fix ptest failure in landlock

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 tracing. We need to update the strace
expected string to match.

Upstream-Status: Submitted [https://lists.strace.io/pipermail/strace-devel/2022-April/011064.html]

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit bf7d885aef06f6208533dd5fab45ee8e92d6d6d7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
meta/recipes-devtools/strace/strace/0001-landlock-update-expected-string.patch [new file with mode: 0644]
meta/recipes-devtools/strace/strace_5.16.bb