diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-10 18:20:48 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-10 18:20:48 +0000 |
| commit | 0e770f4e70e8221454854b962adc258b6035ecdd (patch) | |
| tree | db146cb0453047b334e6cc882fda74fd7cba3525 /arch/powerpc/kernel/signal_64.c | |
| parent | a69ce65274ff1589bb64ea782a4178d7210da0bb (diff) | |
| parent | cd6f5814252060db2d38f57c602db33696c549c0 (diff) | |
Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-androidlsk-v3.10-16.02-android
Diffstat (limited to 'arch/powerpc/kernel/signal_64.c')
| -rw-r--r-- | arch/powerpc/kernel/signal_64.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index 74d9615a6bb6..2419c17538e2 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c @@ -416,6 +416,10 @@ static long restore_tm_sigcontexts(struct pt_regs *regs, /* get MSR separately, transfer the LE bit if doing signal return */ err |= __get_user(msr, &sc->gp_regs[PT_MSR]); + /* Don't allow reserved mode. */ + if (MSR_TM_RESV(msr)) + return -EINVAL; + /* pull in MSR TM from user context */ regs->msr = (regs->msr & ~MSR_TS_MASK) | (msr & MSR_TS_MASK); |