Commit 4368be27 authored by Helge Deller's avatar Helge Deller Committed by Greg Kroah-Hartman

parisc: Fix kernel panic due invalid values in IAOQ0 or IAOQ1

commit 10835c85 upstream.

On parisc the privilege level of a process is stored in the lowest two bits of
the instruction pointers (IAOQ0 and IAOQ1). On Linux we use privilege level 0
for the kernel and privilege level 3 for user-space. So userspace should not be
allowed to modify IAOQ0 or IAOQ1 of a ptraced process to change it's privilege
level to e.g. 0 to try to gain kernel privileges.

This patch prevents such modifications by always setting the two lowest bits to
one (which relates to privilege level 3 for user-space) if IAOQ0 or IAOQ1 are
modified via ptrace calls in the native and compat ptrace paths.

Link: https://bugs.gentoo.org/481768Reported-by: default avatarJeroen Roovers <jer@gentoo.org>
Cc: <stable@vger.kernel.org>
Tested-by: default avatarRolf Eike Beer <eike-kernel@sf-tec.de>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5403c45a
...@@ -167,6 +167,9 @@ long arch_ptrace(struct task_struct *child, long request, ...@@ -167,6 +167,9 @@ long arch_ptrace(struct task_struct *child, long request,
if ((addr & (sizeof(unsigned long)-1)) || if ((addr & (sizeof(unsigned long)-1)) ||
addr >= sizeof(struct pt_regs)) addr >= sizeof(struct pt_regs))
break; break;
if (addr == PT_IAOQ0 || addr == PT_IAOQ1) {
data |= 3; /* ensure userspace privilege */
}
if ((addr >= PT_GR1 && addr <= PT_GR31) || if ((addr >= PT_GR1 && addr <= PT_GR31) ||
addr == PT_IAOQ0 || addr == PT_IAOQ1 || addr == PT_IAOQ0 || addr == PT_IAOQ1 ||
(addr >= PT_FR0 && addr <= PT_FR31 + 4) || (addr >= PT_FR0 && addr <= PT_FR31 + 4) ||
...@@ -228,16 +231,18 @@ long arch_ptrace(struct task_struct *child, long request, ...@@ -228,16 +231,18 @@ long arch_ptrace(struct task_struct *child, long request,
static compat_ulong_t translate_usr_offset(compat_ulong_t offset) static compat_ulong_t translate_usr_offset(compat_ulong_t offset)
{ {
if (offset < 0) compat_ulong_t pos;
return sizeof(struct pt_regs);
else if (offset <= 32*4) /* gr[0..31] */ if (offset < 32*4) /* gr[0..31] */
return offset * 2 + 4; pos = offset * 2 + 4;
else if (offset <= 32*4+32*8) /* gr[0..31] + fr[0..31] */ else if (offset < 32*4+32*8) /* fr[0] ... fr[31] */
return offset + 32*4; pos = (offset - 32*4) + PT_FR0;
else if (offset < sizeof(struct pt_regs)/2 + 32*4) else if (offset < sizeof(struct pt_regs)/2 + 32*4) /* sr[0] ... ipsw */
return offset * 2 + 4 - 32*8; pos = (offset - 32*4 - 32*8) * 2 + PT_SR0 + 4;
else else
return sizeof(struct pt_regs); pos = sizeof(struct pt_regs);
return pos;
} }
long compat_arch_ptrace(struct task_struct *child, compat_long_t request, long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
...@@ -281,9 +286,12 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, ...@@ -281,9 +286,12 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
addr = translate_usr_offset(addr); addr = translate_usr_offset(addr);
if (addr >= sizeof(struct pt_regs)) if (addr >= sizeof(struct pt_regs))
break; break;
if (addr == PT_IAOQ0+4 || addr == PT_IAOQ1+4) {
data |= 3; /* ensure userspace privilege */
}
if (addr >= PT_FR0 && addr <= PT_FR31 + 4) { if (addr >= PT_FR0 && addr <= PT_FR31 + 4) {
/* Special case, fp regs are 64 bits anyway */ /* Special case, fp regs are 64 bits anyway */
*(__u64 *) ((char *) task_regs(child) + addr) = data; *(__u32 *) ((char *) task_regs(child) + addr) = data;
ret = 0; ret = 0;
} }
else if ((addr >= PT_GR1+4 && addr <= PT_GR31+4) || else if ((addr >= PT_GR1+4 && addr <= PT_GR31+4) ||
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment