Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f4ef354 authored by Nick Desaulniers's avatar Nick Desaulniers Committed by Greg Kroah-Hartman
Browse files

selftests: sigaltstack: fix -Wuninitialized 



[ Upstream commit 05107edc910135d27fe557267dc45be9630bf3dd ]

Building sigaltstack with clang via:
$ ARCH=x86 make LLVM=1 -C tools/testing/selftests/sigaltstack/

produces the following warning:
  warning: variable 'sp' is uninitialized when used here [-Wuninitialized]
  if (sp < (unsigned long)sstack ||
      ^~

Clang expects these to be declared at global scope; we've fixed this in
the kernel proper by using the macro `current_stack_pointer`. This is
defined in different headers for different target architectures, so just
create a new header that defines the arch-specific register names for
the stack pointer register, and define it for more targets (at least the
ones that support current_stack_pointer/ARCH_HAS_CURRENT_STACK_POINTER).

Reported-by: default avatarLinux Kernel Functional Testing <lkft@linaro.org>
Link: https://lore.kernel.org/lkml/CA+G9fYsi3OOu7yCsMutpzKDnBMAzJBCPimBp86LhGBa0eCnEpA@mail.gmail.com/


Signed-off-by: default avatarNick Desaulniers <ndesaulniers@google.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarLinux Kernel Functional Testing <lkft@linaro.org>
Tested-by: default avatarAnders Roxell <anders.roxell@linaro.org>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a725dddf

tools/testing/selftests/sigaltstack/current_stack_pointer.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#if __alpha__

register unsigned long sp asm("$30");

#elif __arm__ || __aarch64__ || __csky__ || __m68k__ || __mips__ || __riscv

register unsigned long sp asm("sp");

#elif __i386__

register unsigned long sp asm("esp");

#elif __loongarch64

register unsigned long sp asm("$sp");

#elif __ppc__

register unsigned long sp asm("r1");

#elif __s390x__

register unsigned long sp asm("%15");

#elif __sh__

register unsigned long sp asm("r15");

#elif __x86_64__

register unsigned long sp asm("rsp");

#elif __XTENSA__

register unsigned long sp asm("a1");

#else

#error "implement current_stack_pointer equivalent"

#endif

tools/testing/selftests/sigaltstack/sas.c

+1 −6
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <errno.h>



#include "../kselftest.h"

#include "current_stack_pointer.h"



#ifndef SS_AUTODISARM

#define SS_AUTODISARM  (1U << 31)
@@ -40,12 +41,6 @@ void my_usr1(int sig, siginfo_t *si, void *u) 
	stack_t stk;

	struct stk_data *p;



#if __s390x__

	register unsigned long sp asm("%15");

#else

	register unsigned long sp asm("sp");

#endif



	if (sp < (unsigned long)sstack ||

			sp >= (unsigned long)sstack + SIGSTKSZ) {

		ksft_exit_fail_msg("SP is not on sigaltstack\n");