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

Commit 5910cfdc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc updates from Helge Deller:
 "The most important patch is a new Light Weigth Syscall (LWS) for 8,
  16, 32 and 64 bit atomic CAS operations which is required in order to
  be able to implement the atomic gcc builtins on our platform.

  Other than that, we wire up the seccomp, getrandom and memfd_create
  syscalls, fixes a minor off-by-one bug and a wrong printk string"

* 'parisc-3.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Implement new LWS CAS supporting 64 bit operations.
  parisc: Wire up seccomp, getrandom and memfd_create syscalls
  parisc: dino: fix %d confusingly prefixed with 0x in format string
  parisc: sys_hpux: NUL terminator is one past the end
parents 02c1be3d 89206491

arch/parisc/Kconfig

+16 −0
Original line number Diff line number Diff line
@@ -321,6 +321,22 @@ source "fs/Kconfig" 


source "arch/parisc/Kconfig.debug"



config SECCOMP

	def_bool y

	prompt "Enable seccomp to safely compute untrusted bytecode"

	---help---

	  This kernel feature is useful for number crunching applications

	  that may need to compute untrusted bytecode during their

	  execution. By using pipes or other transports made available to

	  the process as file descriptors supporting the read/write

	  syscalls, it's possible to isolate those applications in

	  their own address space using seccomp. Once seccomp is

	  enabled via prctl(PR_SET_SECCOMP), it cannot be disabled

	  and the task is only allowed to execute a few safe syscalls

	  defined by each seccomp mode.



	  If unsure, say Y. Only embedded should say N here.



source "security/Kconfig"



source "crypto/Kconfig"

arch/parisc/hpux/sys_hpux.c

+1 −1
Original line number Diff line number Diff line
@@ -456,7 +456,7 @@ int hpux_sysfs(int opcode, unsigned long arg1, unsigned long arg2) 
		}



		/* String could be altered by userspace after strlen_user() */

		fsname[len] = '\0';

		fsname[len - 1] = '\0';



		printk(KERN_DEBUG "that is '%s' as (char *)\n", fsname);

		if ( !strcmp(fsname, "hfs") ) {

arch/parisc/include/asm/seccomp.h

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#ifndef _ASM_PARISC_SECCOMP_H

#define _ASM_PARISC_SECCOMP_H



#include <linux/unistd.h>



#define __NR_seccomp_read __NR_read

#define __NR_seccomp_write __NR_write

#define __NR_seccomp_exit __NR_exit

#define __NR_seccomp_sigreturn __NR_rt_sigreturn



#define __NR_seccomp_read_32 __NR_read

#define __NR_seccomp_write_32 __NR_write

#define __NR_seccomp_exit_32 __NR_exit

#define __NR_seccomp_sigreturn_32 __NR_rt_sigreturn



#endif	/* _ASM_PARISC_SECCOMP_H */

arch/parisc/include/asm/thread_info.h

+4 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ struct thread_info { 
#define TIF_NOTIFY_RESUME	8	/* callback before returning to user */

#define TIF_SINGLESTEP		9	/* single stepping? */

#define TIF_BLOCKSTEP		10	/* branch stepping? */

#define TIF_SECCOMP		11	/* secure computing */



#define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)

#define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
@@ -70,11 +71,13 @@ struct thread_info { 
#define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)

#define _TIF_SINGLESTEP		(1 << TIF_SINGLESTEP)

#define _TIF_BLOCKSTEP		(1 << TIF_BLOCKSTEP)

#define _TIF_SECCOMP		(1 << TIF_SECCOMP)



#define _TIF_USER_WORK_MASK     (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | \

                                 _TIF_NEED_RESCHED)

#define _TIF_SYSCALL_TRACE_MASK (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP |	\

				 _TIF_BLOCKSTEP | _TIF_SYSCALL_AUDIT)

				 _TIF_BLOCKSTEP | _TIF_SYSCALL_AUDIT | \

				 _TIF_SECCOMP)



#ifdef CONFIG_64BIT

# ifdef CONFIG_COMPAT

arch/parisc/include/uapi/asm/unistd.h

+4 −1
Original line number Diff line number Diff line
@@ -830,8 +830,11 @@ 
#define __NR_sched_getattr	(__NR_Linux + 335)

#define __NR_utimes		(__NR_Linux + 336)

#define __NR_renameat2		(__NR_Linux + 337)

#define __NR_seccomp		(__NR_Linux + 338)

#define __NR_getrandom		(__NR_Linux + 339)

#define __NR_memfd_create	(__NR_Linux + 340)



#define __NR_Linux_syscalls	(__NR_renameat2 + 1)

#define __NR_Linux_syscalls	(__NR_memfd_create + 1)





#define __IGNORE_select		/* newselect */