openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

signal: Remove unncessary #ifdef SEGV_PKUERR in 32bit compat code 

The only architecture that does not support SEGV_PKUERR is ia64 and
ia64 has not had 32bit support since some time in 2008.  Therefore
copy_siginfo_to_user32 and copy_siginfo_from_user32 do not need to
include support for a missing SEGV_PKUERR.

Compile test on ia64.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
Eric W. Biederman 2018-04-24 21:06:43 -05:00
parent 76b7f67073
commit 36a4ca3d9b
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kernel/signal.c
View File

@ -2888,12 +2888,9 @@ int __copy_siginfo_to_user32(struct compat_siginfo __user *to,
new.si_lower = ptr_to_compat(from->si_lower);
new.si_upper = ptr_to_compat(from->si_upper);
}
#ifdef SEGV_PKUERR
if ((from->si_signo == SIGSEGV) &&
(from->si_code == SEGV_PKUERR))
new.si_pkey = from->si_pkey;
#endif
break;
case SIL_CHLD:
new.si_pid = from->si_pid;
@ -2968,10 +2965,8 @@ int copy_siginfo_from_user32(struct siginfo *to,
to->si_lower = compat_ptr(from.si_lower);
to->si_upper = compat_ptr(from.si_upper);
}
#ifdef SEGV_PKUERR
if ((from.si_signo == SIGSEGV) && (from.si_code == SEGV_PKUERR))
to->si_pkey = from.si_pkey;
#endif
break;
case SIL_CHLD:
to->si_pid = from.si_pid;