linux-kernel - Re: linux-next: manual merge of the tip tree with the origin tree

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 for Android: free password hash cracker in your pocket

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

Date:   Thu, 4 May 2023 07:16:30 -0700
From:   Dave Hansen <dave.hansen@...el.com>
To:     Mark Brown <broonie@...isterre.sirena.org.uk>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>,
        "H . Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>
Cc:     Andrew Morton <akpm@...ux-foundation.org>,
        Dave Hansen <dave.hansen@...ux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Nhat Pham <nphamcs@...il.com>,
        Rick Edgecombe <rick.p.edgecombe@...el.com>
Subject: Re: linux-next: manual merge of the tip tree with the origin tree

On 5/4/23 06:18, Mark Brown wrote:
> diff --cc arch/x86/entry/syscalls/syscall_64.tbl
> index 227538b0ce801,f65c671ce3b14..0000000000000
> --- a/arch/x86/entry/syscalls/syscall_64.tbl
> +++ b/arch/x86/entry/syscalls/syscall_64.tbl
> @@@ -372,7 -372,7 +372,8 @@@
>   448	common	process_mrelease	sys_process_mrelease
>   449	common	futex_waitv		sys_futex_waitv
>   450	common	set_mempolicy_home_node	sys_set_mempolicy_home_node
>  -451	64	map_shadow_stack	sys_map_shadow_stack
>  +451	common	cachestat		sys_cachestat
> ++452	64	map_shadow_stack	sys_map_shadow_stack

Hi Mark,

This will break the shadow stack selftest:

	tools/testing/selftests/x86/test_shadow_stack.c

since it has:

	#define __NR_map_shadow_stack  451

This also missed bumping:

	#define __NR_syscalls 452

in include/uapi/asm-generic/unistd.h.