diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2021-03-19 12:06:55 +0100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2021-04-03 12:22:19 +0200 |
| commit | 362471b3192e4184fff5fedee1ea20bdf637a0c8 (patch) | |
| tree | 7ac4ec1511ebea6086e6e60cf35e89c656d3ddc0 /arch/powerpc | |
| parent | powerpc/signal32: Remove ifdefery in middle of if/else in sigreturn() (diff) | |
| download | linux-362471b3192e4184fff5fedee1ea20bdf637a0c8.tar.xz linux-362471b3192e4184fff5fedee1ea20bdf637a0c8.zip | |
powerpc/signal32: Perform access_ok() inside restore_user_regs()
In preparation of using user_access_begin/end in restore_user_regs(),
move the access_ok() inside the function.
It makes no difference as the behaviour on a failed access_ok() is
the same as on failed restore_user_regs().
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/c106eb2f37c3040f1fd38b40e50c670feb7cb835.1616151715.git.christophe.leroy@csgroup.eu
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/signal_32.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c index 8dfe4fe77706..e2b1d2a0abad 100644 --- a/arch/powerpc/kernel/signal_32.c +++ b/arch/powerpc/kernel/signal_32.c @@ -492,6 +492,8 @@ static long restore_user_regs(struct pt_regs *regs, int i; #endif + if (!access_ok(sr, sizeof(*sr))) + return 1; /* * restore general registers but not including MSR or SOFTE. Also * take care of keeping r2 (TLS) intact if not a signal @@ -963,13 +965,10 @@ static int do_setcontext(struct ucontext __user *ucp, struct pt_regs *regs, int if (__get_user(cmcp, &ucp->uc_regs)) return -EFAULT; mcp = (struct mcontext __user *)(u64)cmcp; - /* no need to check access_ok(mcp), since mcp < 4GB */ } #else if (__get_user(mcp, &ucp->uc_regs)) return -EFAULT; - if (!access_ok(mcp, sizeof(*mcp))) - return -EFAULT; #endif set_current_blocked(&set); if (restore_user_regs(regs, mcp, sig)) @@ -1362,8 +1361,7 @@ SYSCALL_DEFINE0(sigreturn) } else { sr = (struct mcontext __user *)from_user_ptr(sigctx.regs); addr = sr; - if (!access_ok(sr, sizeof(*sr)) - || restore_user_regs(regs, sr, 1)) + if (restore_user_regs(regs, sr, 1)) goto badframe; } |