|
@@ -897,9 +897,9 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
|
|
|
|
|
|
static noinline void
|
|
static noinline void
|
|
bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
|
|
bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
|
|
- unsigned long address, u32 *pkey)
|
|
|
|
|
|
+ unsigned long address)
|
|
{
|
|
{
|
|
- __bad_area_nosemaphore(regs, error_code, address, pkey, SEGV_MAPERR);
|
|
|
|
|
|
+ __bad_area_nosemaphore(regs, error_code, address, NULL, SEGV_MAPERR);
|
|
}
|
|
}
|
|
|
|
|
|
static void
|
|
static void
|
|
@@ -1026,7 +1026,7 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code,
|
|
VM_FAULT_HWPOISON_LARGE))
|
|
VM_FAULT_HWPOISON_LARGE))
|
|
do_sigbus(regs, error_code, address, pkey, fault);
|
|
do_sigbus(regs, error_code, address, pkey, fault);
|
|
else if (fault & VM_FAULT_SIGSEGV)
|
|
else if (fault & VM_FAULT_SIGSEGV)
|
|
- bad_area_nosemaphore(regs, error_code, address, pkey);
|
|
|
|
|
|
+ bad_area_nosemaphore(regs, error_code, address);
|
|
else
|
|
else
|
|
BUG();
|
|
BUG();
|
|
}
|
|
}
|
|
@@ -1256,7 +1256,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
|
|
* Don't take the mm semaphore here. If we fixup a prefetch
|
|
* Don't take the mm semaphore here. If we fixup a prefetch
|
|
* fault we could otherwise deadlock:
|
|
* fault we could otherwise deadlock:
|
|
*/
|
|
*/
|
|
- bad_area_nosemaphore(regs, error_code, address, NULL);
|
|
|
|
|
|
+ bad_area_nosemaphore(regs, error_code, address);
|
|
|
|
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -1269,7 +1269,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
|
|
pgtable_bad(regs, error_code, address);
|
|
pgtable_bad(regs, error_code, address);
|
|
|
|
|
|
if (unlikely(smap_violation(error_code, regs))) {
|
|
if (unlikely(smap_violation(error_code, regs))) {
|
|
- bad_area_nosemaphore(regs, error_code, address, NULL);
|
|
|
|
|
|
+ bad_area_nosemaphore(regs, error_code, address);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1278,7 +1278,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
|
|
* in a region with pagefaults disabled then we must not take the fault
|
|
* in a region with pagefaults disabled then we must not take the fault
|
|
*/
|
|
*/
|
|
if (unlikely(faulthandler_disabled() || !mm)) {
|
|
if (unlikely(faulthandler_disabled() || !mm)) {
|
|
- bad_area_nosemaphore(regs, error_code, address, NULL);
|
|
|
|
|
|
+ bad_area_nosemaphore(regs, error_code, address);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1324,7 +1324,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
|
|
if (unlikely(!down_read_trylock(&mm->mmap_sem))) {
|
|
if (unlikely(!down_read_trylock(&mm->mmap_sem))) {
|
|
if (!(error_code & X86_PF_USER) &&
|
|
if (!(error_code & X86_PF_USER) &&
|
|
!search_exception_tables(regs->ip)) {
|
|
!search_exception_tables(regs->ip)) {
|
|
- bad_area_nosemaphore(regs, error_code, address, NULL);
|
|
|
|
|
|
+ bad_area_nosemaphore(regs, error_code, address);
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
retry:
|
|
retry:
|