Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 101b3531 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

Protect manipulation of c0_status against preemption and multithreading. 


    
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 8afcb5d8

arch/mips/kernel/ptrace.c

+31 −8
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <asm/dsp.h>

#include <asm/fpu.h>

#include <asm/mipsregs.h>

#include <asm/mipsmtregs.h>

#include <asm/pgtable.h>

#include <asm/page.h>

#include <asm/system.h>
@@ -126,10 +127,21 @@ int ptrace_getfpregs (struct task_struct *child, __u32 __user *data) 


		__put_user (child->thread.fpu.hard.fcr31, data + 64);



		preempt_disable();

		if (cpu_has_mipsmt) {

			unsigned int vpflags = dvpe();

			flags = read_c0_status();

			__enable_fpu();

			__asm__ __volatile__("cfc1\t%0,$0" : "=r" (tmp));

			write_c0_status(flags);

			evpe(vpflags);

		} else {

			flags = read_c0_status();

			__enable_fpu();

			__asm__ __volatile__("cfc1\t%0,$0" : "=r" (tmp));

			write_c0_status(flags);

		}

		preempt_enable();

		__put_user (tmp, data + 65);

	} else {

		__put_user (child->thread.fpu.soft.fcr31, data + 64);
@@ -284,10 +296,21 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) 
			if (!cpu_has_fpu)

				break;



			preempt_disable();

			if (cpu_has_mipsmt) {

				unsigned int vpflags = dvpe();

				flags = read_c0_status();

				__enable_fpu();

				__asm__ __volatile__("cfc1\t%0,$0": "=r" (tmp));

				write_c0_status(flags);

				evpe(vpflags);

			} else {

				flags = read_c0_status();

				__enable_fpu();

				__asm__ __volatile__("cfc1\t%0,$0": "=r" (tmp));

				write_c0_status(flags);

			}

			preempt_enable();

			break;

		}

		case DSP_BASE ... DSP_BASE + 5: {

arch/mips/kernel/ptrace32.c

+16 −4
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/dsp.h>

#include <asm/fpu.h>

#include <asm/mipsregs.h>

#include <asm/mipsmtregs.h>

#include <asm/pgtable.h>

#include <asm/page.h>

#include <asm/system.h>
@@ -191,10 +192,21 @@ asmlinkage int sys32_ptrace(int request, int pid, int addr, int data) 
			if (!cpu_has_fpu)

				break;



			preempt_disable();

			if (cpu_has_mipsmt) {

				unsigned int vpflags = dvpe();

				flags = read_c0_status();

				__enable_fpu();

				__asm__ __volatile__("cfc1\t%0,$0": "=r" (tmp));

				write_c0_status(flags);

				evpe(vpflags);

			} else {

				flags = read_c0_status();

				__enable_fpu();

				__asm__ __volatile__("cfc1\t%0,$0": "=r" (tmp));

				write_c0_status(flags);

			}

			preempt_enable();

			break;

		}

		case DSP_BASE ... DSP_BASE + 5: