linux-kernel - Re: [PATCH v3 1/6] selftests/mm: mseal, self_elf: fix missing __NR

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Tue, 18 Jun 2024 08:56:28 +0200
From: David Hildenbrand <david@...hat.com>
To: John Hubbard <jhubbard@...dia.com>,
 Andrew Morton <akpm@...ux-foundation.org>, Jeff Xu <jeffxu@...omium.org>,
 Shuah Khan <shuah@...nel.org>
Cc: Andrei Vagin <avagin@...gle.com>,
 Axel Rasmussen <axelrasmussen@...gle.com>,
 Christian Brauner <brauner@...nel.org>, Kees Cook <kees@...nel.org>,
 Kent Overstreet <kent.overstreet@...ux.dev>,
 "Liam R . Howlett" <Liam.Howlett@...cle.com>,
 Muhammad Usama Anjum <usama.anjum@...labora.com>,
 Peter Xu <peterx@...hat.com>, Rich Felker <dalias@...c.org>,
 linux-mm@...ck.org, linux-kselftest@...r.kernel.org,
 LKML <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v3 1/6] selftests/mm: mseal, self_elf: fix missing
 __NR_mseal

On 18.06.24 04:24, John Hubbard wrote:
> The selftests/mm build isn't exactly "broken", according to the current
> documentation, which still claims that one must run "make headers",
> before building the kselftests. However, according to the new plan to
> get rid of that requirement [1], they are future-broken: attempting to
> build selftests/mm *without* first running "make headers" will fail due
> to not finding __NR_mseal.
> 
> Therefore, include asm-generic/unistd.h, which has all of the system
> call numbers that are needed, abstracted across the various CPU arches.
> 
> [1] commit e076eaca5906 ("selftests: break the dependency upon local
> header files")
> 
> Fixes: 4926c7a52de7 ("selftest mm/mseal memory sealing")
> Cc: Jeff Xu <jeffxu@...omium.org>
> Cc: David Hildenbrand <david@...hat.com>
> Signed-off-by: John Hubbard <jhubbard@...dia.com>
> ---
>   tools/testing/selftests/mm/mseal_test.c | 2 +-
>   tools/testing/selftests/mm/seal_elf.c   | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/mm/mseal_test.c b/tools/testing/selftests/mm/mseal_test.c
> index 41998cf1dcf5..58c888529f42 100644
> --- a/tools/testing/selftests/mm/mseal_test.c
> +++ b/tools/testing/selftests/mm/mseal_test.c
> @@ -3,7 +3,7 @@
>   #include <linux/mman.h>
>   #include <sys/mman.h>
>   #include <stdint.h>
> -#include <unistd.h>
> +#include <asm-generic/unistd.h>
>   #include <string.h>
>   #include <sys/time.h>
>   #include <sys/resource.h>
> diff --git a/tools/testing/selftests/mm/seal_elf.c b/tools/testing/selftests/mm/seal_elf.c
> index f2babec79bb6..27bf2f84231d 100644
> --- a/tools/testing/selftests/mm/seal_elf.c
> +++ b/tools/testing/selftests/mm/seal_elf.c
> @@ -2,7 +2,7 @@
>   #define _GNU_SOURCE
>   #include <sys/mman.h>
>   #include <stdint.h>
> -#include <unistd.h>
> +#include <asm-generic/unistd.h>
>   #include <string.h>
>   #include <sys/time.h>
>   #include <sys/resource.h>

Still confused. Let's take a look at "microblaze".

arch/microblaze/include/asm/unistd.h
  -> #include <uapi/asm/unistd.h>

arch/microblaze/include/uapi/asm/unistd.h
  -> #include <asm/unistd_32.h>
   -> Generated during "make headers"

usr/include/asm/unistd_32.h is generated via
arch/microblaze/kernel/syscalls/Makefile with the syshdr command.

So we never end up including asm-generic/unistd.h directly on 
microblaze, but rather converts it (IIUC) to something else.

That will work as expected here?

-- 
Cheers,

David / dhildenb