1 files changed, 2 insertions, 10 deletions

diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c
index ef05755a1900..7ed47b1e6f42 100644
--- a/arch/x86/mm/mpx.c
+++ b/arch/x86/mm/mpx.c
@@ -293,7 +293,7 @@ siginfo_t *mpx_generate_siginfo(struct pt_regs *regs)
          * We were not able to extract an address from the instruction,
          * probably because there was something invalid in it.
          */
-        if (info->si_addr == (void *)-1) {
+        if (info->si_addr == (void __user *)-1) {
                 err = -EINVAL;
                 goto err_out;
         }
@@ -525,15 +525,7 @@ int mpx_handle_bd_fault(void)
         if (!kernel_managing_mpx_tables(current->mm))
                 return -EINVAL;
 
-        if (do_mpx_bt_fault()) {
-                force_sig(SIGSEGV, current);
-                /*
-                 * The force_sig() is essentially "handling" this
-                 * exception, so we do not pass up the error
-                 * from do_mpx_bt_fault().
-                 */
-        }
-        return 0;
+        return do_mpx_bt_fault();
 }
 
 /*