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

Commit d0b5e15f authored by Richard Weinberger's avatar Richard Weinberger
Browse files

um: Remove SKAS3/4 support 



Before we had SKAS0 UML had two modes of operation
TT (tracing thread) and SKAS3/4 (separated kernel address space).
TT was known to be insecure and got removed a long time ago.
SKAS3/4 required a few (3 or 4) patches on the host side which never went
mainline. The last host patch is 10 years old.

With SKAS0 mode (separated kernel address space using 0 host patches),
default since 2005, SKAS3/4 is obsolete and can be removed.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent aaeac66b

arch/um/include/shared/os.h

+0 −2
Original line number Diff line number Diff line
@@ -174,7 +174,6 @@ extern unsigned long long os_makedev(unsigned major, unsigned minor); 


/* start_up.c */

extern void os_early_checks(void);

extern void can_do_skas(void);

extern void os_check_bugs(void);

extern void check_host_supports_tls(int *supports_tls, int *tls_min);
@@ -187,7 +186,6 @@ extern int os_process_parent(int pid); 
extern void os_stop_process(int pid);

extern void os_kill_process(int pid, int reap_child);

extern void os_kill_ptraced_process(int pid, int reap_child);

extern long os_ptrace_ldt(long pid, long addr, long data);



extern int os_getpid(void);

extern int os_getpgrp(void);

arch/um/include/shared/skas/proc_mm.h

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)

 * Licensed under the GPL

 */



#ifndef __SKAS_PROC_MM_H

#define __SKAS_PROC_MM_H



#define MM_MMAP 54

#define MM_MUNMAP 55

#define MM_MPROTECT 56

#define MM_COPY_SEGMENTS 57



struct mm_mmap {

	unsigned long addr;

	unsigned long len;

	unsigned long prot;

	unsigned long flags;

	unsigned long fd;

	unsigned long offset;

};



struct mm_munmap {

	unsigned long addr;

	unsigned long len;

};



struct mm_mprotect {

	unsigned long addr;

	unsigned long len;

	unsigned int prot;

};



struct proc_mm_op {

	int op;

	union {

		struct mm_mmap mmap;

		struct mm_munmap munmap;

	        struct mm_mprotect mprotect;

		int copy_segments;

	} u;

};



#endif

arch/um/include/shared/skas/skas.h

+0 −3
Original line number Diff line number Diff line
@@ -9,13 +9,10 @@ 
#include <sysdep/ptrace.h>



extern int userspace_pid[];

extern int proc_mm, ptrace_faultinfo, ptrace_ldt;

extern int skas_needs_stub;



extern int user_thread(unsigned long stack, int flags);

extern void new_thread_handler(void);

extern void handle_syscall(struct uml_pt_regs *regs);

extern int new_mm(unsigned long stack);

extern long execute_syscall_skas(void *r);

extern unsigned long current_stub_stack(void);

arch/um/include/shared/skas_ptrace.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/* 

 * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 */



#ifndef __SKAS_PTRACE_H

#define __SKAS_PTRACE_H



#define PTRACE_FAULTINFO 52

#define PTRACE_SWITCH_MM 55



#include <sysdep/skas_ptrace.h>



#endif

arch/um/kernel/ptrace.c

+0 −32
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 
#include <linux/sched.h>

#include <linux/tracehook.h>

#include <asm/uaccess.h>

#include <skas_ptrace.h>







void user_enable_single_step(struct task_struct *child)

{
@@ -104,35 +101,6 @@ long arch_ptrace(struct task_struct *child, long request, 
		ret = ptrace_set_thread_area(child, addr, vp);

		break;



	case PTRACE_FAULTINFO: {

		/*

		 * Take the info from thread->arch->faultinfo,

		 * but transfer max. sizeof(struct ptrace_faultinfo).

		 * On i386, ptrace_faultinfo is smaller!

		 */

		ret = copy_to_user(p, &child->thread.arch.faultinfo,

				   sizeof(struct ptrace_faultinfo)) ?

			-EIO : 0;

		break;

	}



#ifdef PTRACE_LDT

	case PTRACE_LDT: {

		struct ptrace_ldt ldt;



		if (copy_from_user(&ldt, p, sizeof(ldt))) {

			ret = -EIO;

			break;

		}



		/*

		 * This one is confusing, so just punt and return -EIO for

		 * now

		 */

		ret = -EIO;

		break;

	}

#endif

	default:

		ret = ptrace_request(child, request, addr, data);

		if (ret == -EIO)