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

Commit e28cbf22 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

improve sys_newuname() for compat architectures 



On an architecture that supports 32-bit compat we need to override the
reported machine in uname with the 32-bit value.  Instead of doing this
separately in every architecture introduce a COMPAT_UTS_MACHINE define in
<asm/compat.h> and apply it directly in sys_newuname().

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: James Morris <jmorris@namei.org>
Cc: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent baed7fc9

arch/ia64/include/asm/compat.h

+2 −1
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/types.h>



#define COMPAT_USER_HZ		100

#define COMPAT_UTS_MACHINE	"i686\0\0\0"



typedef u32		compat_size_t;

typedef s32		compat_ssize_t;

arch/mips/include/asm/compat.h

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <asm/ptrace.h>



#define COMPAT_USER_HZ		100

#define COMPAT_UTS_MACHINE	"mips\0\0\0"



typedef u32		compat_size_t;

typedef s32		compat_ssize_t;

arch/mips/kernel/linux32.c

+0 −16
Original line number Diff line number Diff line
@@ -249,22 +249,6 @@ SYSCALL_DEFINE5(n32_msgrcv, int, msqid, u32, msgp, size_t, msgsz, 
}

#endif



SYSCALL_DEFINE1(32_newuname, struct new_utsname __user *, name)

{

	int ret = 0;



	down_read(&uts_sem);

	if (copy_to_user(name, utsname(), sizeof *name))

		ret = -EFAULT;

	up_read(&uts_sem);



	if (current->personality == PER_LINUX32 && !ret)

		if (copy_to_user(name->machine, "mips\0\0\0", 8))

			ret = -EFAULT;



	return ret;

}



SYSCALL_DEFINE1(32_personality, unsigned long, personality)

{

	int ret;

arch/mips/kernel/scall64-n32.S

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ EXPORT(sysn32_call_table) 
	PTR	sys_exit

	PTR	compat_sys_wait4

	PTR	sys_kill			/* 6060 */

	PTR	sys_32_newuname

	PTR	sys_newuname

	PTR	sys_semget

	PTR	sys_semop

	PTR	sys_n32_semctl

arch/mips/kernel/scall64-o32.S

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ sys_call_table: 
	PTR	sys32_sigreturn

	PTR	sys32_clone			/* 4120 */

	PTR	sys_setdomainname

	PTR	sys_32_newuname

	PTR	sys_newuname

	PTR	sys_ni_syscall			/* sys_modify_ldt */

	PTR	compat_sys_adjtimex

	PTR	sys_mprotect			/* 4125 */