|
@@ -1570,7 +1570,6 @@ int send_sig_mceerr(int code, void __user *addr, short lsb, struct task_struct *
|
|
EXPORT_SYMBOL(send_sig_mceerr);
|
|
EXPORT_SYMBOL(send_sig_mceerr);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
-#ifdef SEGV_BNDERR
|
|
|
|
int force_sig_bnderr(void __user *addr, void __user *lower, void __user *upper)
|
|
int force_sig_bnderr(void __user *addr, void __user *lower, void __user *upper)
|
|
{
|
|
{
|
|
struct siginfo info;
|
|
struct siginfo info;
|
|
@@ -1584,7 +1583,6 @@ int force_sig_bnderr(void __user *addr, void __user *lower, void __user *upper)
|
|
info.si_upper = upper;
|
|
info.si_upper = upper;
|
|
return force_sig_info(info.si_signo, &info, current);
|
|
return force_sig_info(info.si_signo, &info, current);
|
|
}
|
|
}
|
|
-#endif
|
|
|
|
|
|
|
|
#ifdef SEGV_PKUERR
|
|
#ifdef SEGV_PKUERR
|
|
int force_sig_pkuerr(void __user *addr, u32 pkey)
|
|
int force_sig_pkuerr(void __user *addr, u32 pkey)
|
|
@@ -2890,13 +2888,11 @@ int __copy_siginfo_to_user32(struct compat_siginfo __user *to,
|
|
if ((from->si_signo == SIGBUS) && (from->si_code == BUS_MCEERR_AO))
|
|
if ((from->si_signo == SIGBUS) && (from->si_code == BUS_MCEERR_AO))
|
|
new.si_addr_lsb = from->si_addr_lsb;
|
|
new.si_addr_lsb = from->si_addr_lsb;
|
|
#endif
|
|
#endif
|
|
-#ifdef SEGV_BNDERR
|
|
|
|
if ((from->si_signo == SIGSEGV) &&
|
|
if ((from->si_signo == SIGSEGV) &&
|
|
(from->si_code == SEGV_BNDERR)) {
|
|
(from->si_code == SEGV_BNDERR)) {
|
|
new.si_lower = ptr_to_compat(from->si_lower);
|
|
new.si_lower = ptr_to_compat(from->si_lower);
|
|
new.si_upper = ptr_to_compat(from->si_upper);
|
|
new.si_upper = ptr_to_compat(from->si_upper);
|
|
}
|
|
}
|
|
-#endif
|
|
|
|
#ifdef SEGV_PKUERR
|
|
#ifdef SEGV_PKUERR
|
|
if ((from->si_signo == SIGSEGV) &&
|
|
if ((from->si_signo == SIGSEGV) &&
|
|
(from->si_code == SEGV_PKUERR))
|
|
(from->si_code == SEGV_PKUERR))
|
|
@@ -2976,12 +2972,10 @@ int copy_siginfo_from_user32(struct siginfo *to,
|
|
if ((from.si_signo == SIGBUS) && (from.si_code == BUS_MCEERR_AO))
|
|
if ((from.si_signo == SIGBUS) && (from.si_code == BUS_MCEERR_AO))
|
|
to->si_addr_lsb = from.si_addr_lsb;
|
|
to->si_addr_lsb = from.si_addr_lsb;
|
|
#endif
|
|
#endif
|
|
-#ifdef SEGV_BNDERR
|
|
|
|
if ((from.si_signo == SIGSEGV) && (from.si_code == SEGV_BNDERR)) {
|
|
if ((from.si_signo == SIGSEGV) && (from.si_code == SEGV_BNDERR)) {
|
|
to->si_lower = compat_ptr(from.si_lower);
|
|
to->si_lower = compat_ptr(from.si_lower);
|
|
to->si_upper = compat_ptr(from.si_upper);
|
|
to->si_upper = compat_ptr(from.si_upper);
|
|
}
|
|
}
|
|
-#endif
|
|
|
|
#ifdef SEGV_PKUERR
|
|
#ifdef SEGV_PKUERR
|
|
if ((from.si_signo == SIGSEGV) && (from.si_code == SEGV_PKUERR))
|
|
if ((from.si_signo == SIGSEGV) && (from.si_code == SEGV_PKUERR))
|
|
to->si_pkey = from.si_pkey;
|
|
to->si_pkey = from.si_pkey;
|