Commit 3f0c1780 authored by Helge Deller's avatar Helge Deller
Browse files

parisc: Replace hardcoded value with PRIV_USER constant in ptrace.c 



Prefer usage of the PRIV_USER constant over the hard-coded value to set
the lowest 2 bits for the userspace privilege.

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # 5.16+
parent 5d1335da

arch/parisc/kernel/ptrace.c

+3 −3
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ long arch_ptrace(struct task_struct *child, long request, 
		     addr >= sizeof(struct pt_regs))

			break;

		if (addr == PT_IAOQ0 || addr == PT_IAOQ1) {

			data |= 3; /* ensure userspace privilege */

			data |= PRIV_USER; /* ensure userspace privilege */

		}

		if ((addr >= PT_GR1 && addr <= PT_GR31) ||

				addr == PT_IAOQ0 || addr == PT_IAOQ1 ||
@@ -285,7 +285,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, 
			if (addr >= sizeof(struct pt_regs))

				break;

			if (addr == PT_IAOQ0+4 || addr == PT_IAOQ1+4) {

				data |= 3; /* ensure userspace privilege */

				data |= PRIV_USER; /* ensure userspace privilege */

			}

			if (addr >= PT_FR0 && addr <= PT_FR31 + 4) {

				/* Special case, fp regs are 64 bits anyway */
@@ -484,7 +484,7 @@ static void set_reg(struct pt_regs *regs, int num, unsigned long val) 
	case RI(iaoq[0]):

	case RI(iaoq[1]):

			/* set 2 lowest bits to ensure userspace privilege: */

			regs->iaoq[num - RI(iaoq[0])] = val | 3;

			regs->iaoq[num - RI(iaoq[0])] = val | PRIV_USER;

			return;

	case RI(sar):	regs->sar = val;

			return;