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

Commit 2413ed88 authored by Krzysztof Mazur's avatar Krzysztof Mazur Committed by Greg Kroah-Hartman
Browse files

um: Use POSIX ucontext_t instead of struct ucontext 



commit 4d1a535b8ec5e74b42dfd9dc809142653b2597f6 upstream.

glibc 2.26 removed the 'struct ucontext' to "improve" POSIX compliance
and break programs, including User Mode Linux. Fix User Mode Linux
by using POSIX ucontext_t.

This fixes:

arch/um/os-Linux/signal.c: In function 'hard_handler':
arch/um/os-Linux/signal.c:163:22: error: dereferencing pointer to incomplete type 'struct ucontext'
  mcontext_t *mc = &uc->uc_mcontext;
arch/x86/um/stub_segv.c: In function 'stub_segv_handler':
arch/x86/um/stub_segv.c:16:13: error: dereferencing pointer to incomplete type 'struct ucontext'
          &uc->uc_mcontext);

Cc: stable@vger.kernel.org
Signed-off-by: default avatarKrzysztof Mazur <krzysiek@podlesie.net>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 82807520

arch/um/os-Linux/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static void (*handlers[_NSIG])(int sig, struct siginfo *si, mcontext_t *mc) = { 


static void hard_handler(int sig, siginfo_t *si, void *p)

{

	struct ucontext *uc = p;

	ucontext_t *uc = p;

	mcontext_t *mc = &uc->uc_mcontext;

	unsigned long pending = 1UL << sig;

arch/x86/um/stub_segv.c

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
void __attribute__ ((__section__ (".__syscall_stub")))

stub_segv_handler(int sig, siginfo_t *info, void *p)

{

	struct ucontext *uc = p;

	ucontext_t *uc = p;



	GET_FAULTINFO_FROM_MC(*((struct faultinfo *) STUB_DATA),

			      &uc->uc_mcontext);