x86/signals: Add missing signal_compat code for x86 features

[mirror_ubuntu-bionic-kernel.git] / arch / x86 / kernel / signal_compat.c

diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c
index dc3c0b1c816fabb7112426754c3e4bbc86df986a..5335ad96a290952669d25fe29f3da2b6f0bdb66f 100644 (file)
--- a/arch/x86/kernel/signal_compat.c
+++ b/arch/x86/kernel/signal_compat.c
@@ -32,6 +32,21 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from)
                                          &to->_sifields._pad[0]);
                        switch (from->si_code >> 16) {
                        case __SI_FAULT >> 16:
+                               if (from->si_signo == SIGBUS &&
+                                   (from->si_code == BUS_MCEERR_AR ||
+                                    from->si_code == BUS_MCEERR_AO))
+                                       put_user_ex(from->si_addr_lsb, &to->si_addr_lsb);
+
+                               if (from->si_signo == SIGSEGV) {
+                                       if (from->si_code == SEGV_BNDERR) {
+                                               compat_uptr_t lower = (unsigned long)&to->si_lower;
+                                               compat_uptr_t upper = (unsigned long)&to->si_upper;
+                                               put_user_ex(lower, &to->si_lower);
+                                               put_user_ex(upper, &to->si_upper);
+                                       }
+                                       if (from->si_code == SEGV_PKUERR)
+                                               put_user_ex(from->si_pkey, &to->si_pkey);
+                               }
                                break;
                        case __SI_SYS >> 16:
                                put_user_ex(from->si_syscall, &to->si_syscall);