diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-12-27 02:23:46 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-03-28 18:23:18 -0400 |
| commit | f14d6b4f52616465fead8c4b6508a6687032660d (patch) | |
| tree | 97756654a2df6d2f2916bfed6379abddd0de143f /arch/alpha/kernel | |
| parent | d78d834bed81bf838281270c7ae3790c88fc95aa (diff) | |
| download | blackbird-op-linux-f14d6b4f52616465fead8c4b6508a6687032660d.tar.gz blackbird-op-linux-f14d6b4f52616465fead8c4b6508a6687032660d.zip | |
alpha: don't bother with __access_ok() in traps.c
we want to check that address is below TASK_SIZE; sure,
__access_ok(addr, 0, USER_DS) will do that, but it's more straightforward
to just spell it out and that way we can get rid of the damn 'segment'
argument of __access_ok().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/alpha/kernel')
| -rw-r--r-- | arch/alpha/kernel/traps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index b137390e87e7..b724ad88f7e8 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c @@ -802,7 +802,7 @@ do_entUnaUser(void __user * va, unsigned long opcode, /* Don't bother reading ds in the access check since we already know that this came from the user. Also rely on the fact that the page at TASK_SIZE is unmapped and so can't be touched anyway. */ - if (!__access_ok((unsigned long)va, 0, USER_DS)) + if ((unsigned long)va >= TASK_SIZE) goto give_sigsegv; ++unaligned[1].count; @@ -1047,7 +1047,7 @@ give_sigsegv: /* We need to replicate some of the logic in mm/fault.c, since we don't have access to the fault code in the exception handling return path. */ - if (!__access_ok((unsigned long)va, 0, USER_DS)) + if ((unsigned long)va >= TASK_SIZE) info.si_code = SEGV_ACCERR; else { struct mm_struct *mm = current->mm; |
