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

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

Add generic sys_olduname() 



Add generic implementations of the old and really old uname system calls.
Note that sh only implements sys_olduname but not sys_oldolduname, but I'm
not going to bother with another ifdef for that special case.

m32r implemented an old uname but never wired it up, so kill it, too.

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 e28cbf22

arch/m32r/kernel/sys_m32r.c

+0 −11
Original line number Diff line number Diff line
@@ -76,17 +76,6 @@ asmlinkage int sys_tas(int __user *addr) 
	return oldval;

}



asmlinkage int sys_uname(struct old_utsname __user * name)

{

	int err;

	if (!name)

		return -EFAULT;

	down_read(&uts_sem);

	err = copy_to_user(name, utsname(), sizeof (*name));

	up_read(&uts_sem);

	return err?-EFAULT:0;

}



asmlinkage int sys_cacheflush(void *addr, int bytes, int cache)

{

	/* This should flush more selectively ...  */

arch/mips/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -1014,6 +1014,7 @@ 
#define __ARCH_WANT_SYS_LLSEEK

#define __ARCH_WANT_SYS_NICE

#define __ARCH_WANT_SYS_OLD_GETRLIMIT

#define __ARCH_WANT_SYS_OLD_UNAME

#define __ARCH_WANT_SYS_OLDUMOUNT

#define __ARCH_WANT_SYS_SIGPENDING

#define __ARCH_WANT_SYS_SIGPROCMASK

arch/mips/kernel/syscall.c

+0 −42
Original line number Diff line number Diff line
@@ -215,48 +215,6 @@ asmlinkage int sys_execve(nabi_no_regargs struct pt_regs regs) 
	return error;

}



/*

 * Compacrapability ...

 */

SYSCALL_DEFINE1(uname, struct old_utsname __user *, name)

{

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

		return 0;

	return -EFAULT;

}



/*

 * Compacrapability ...

 */

SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)

{

	int error;



	if (!name)

		return -EFAULT;

	if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname)))

		return -EFAULT;



	error = __copy_to_user(&name->sysname, &utsname()->sysname,

			       __OLD_UTS_LEN);

	error -= __put_user(0, name->sysname + __OLD_UTS_LEN);

	error -= __copy_to_user(&name->nodename, &utsname()->nodename,

				__OLD_UTS_LEN);

	error -= __put_user(0, name->nodename + __OLD_UTS_LEN);

	error -= __copy_to_user(&name->release, &utsname()->release,

				__OLD_UTS_LEN);

	error -= __put_user(0, name->release + __OLD_UTS_LEN);

	error -= __copy_to_user(&name->version, &utsname()->version,

				__OLD_UTS_LEN);

	error -= __put_user(0, name->version + __OLD_UTS_LEN);

	error -= __copy_to_user(&name->machine, &utsname()->machine,

				__OLD_UTS_LEN);

	error = __put_user(0, name->machine + __OLD_UTS_LEN);

	error = error ? -EFAULT : 0;



	return error;

}



SYSCALL_DEFINE1(set_thread_area, unsigned long, addr)

{

	struct thread_info *ti = task_thread_info(current);

arch/powerpc/include/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ 
#define __ARCH_WANT_SYS_LLSEEK

#define __ARCH_WANT_SYS_NICE

#define __ARCH_WANT_SYS_OLD_GETRLIMIT

#define __ARCH_WANT_SYS_OLD_UNAME

#define __ARCH_WANT_SYS_OLDUMOUNT

#define __ARCH_WANT_SYS_SIGPENDING

#define __ARCH_WANT_SYS_SIGPROCMASK

arch/powerpc/kernel/syscalls.c

+0 −57
Original line number Diff line number Diff line
@@ -116,63 +116,6 @@ long ppc64_personality(unsigned long personality) 
}

#endif



#ifdef CONFIG_PPC64

#define OVERRIDE_MACHINE    (personality(current->personality) == PER_LINUX32)

#else

#define OVERRIDE_MACHINE    0

#endif



static inline int override_machine(char __user *mach)

{

	if (OVERRIDE_MACHINE) {

		/* change ppc64 to ppc */

		if (__put_user(0, mach+3) || __put_user(0, mach+4))

			return -EFAULT;

	}

	return 0;

}



int sys_uname(struct old_utsname __user *name)

{

	int err = 0;

	

	down_read(&uts_sem);

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

		err = -EFAULT;

	up_read(&uts_sem);

	if (!err)

		err = override_machine(name->machine);

	return err;

}



int sys_olduname(struct oldold_utsname __user *name)

{

	int error;



	if (!access_ok(VERIFY_WRITE, name, sizeof(struct oldold_utsname)))

		return -EFAULT;

  

	down_read(&uts_sem);

	error = __copy_to_user(&name->sysname, &utsname()->sysname,

			       __OLD_UTS_LEN);

	error |= __put_user(0, name->sysname + __OLD_UTS_LEN);

	error |= __copy_to_user(&name->nodename, &utsname()->nodename,

				__OLD_UTS_LEN);

	error |= __put_user(0, name->nodename + __OLD_UTS_LEN);

	error |= __copy_to_user(&name->release, &utsname()->release,

				__OLD_UTS_LEN);

	error |= __put_user(0, name->release + __OLD_UTS_LEN);

	error |= __copy_to_user(&name->version, &utsname()->version,

				__OLD_UTS_LEN);

	error |= __put_user(0, name->version + __OLD_UTS_LEN);

	error |= __copy_to_user(&name->machine, &utsname()->machine,

				__OLD_UTS_LEN);

	error |= override_machine(name->machine);

	up_read(&uts_sem);



	return error? -EFAULT: 0;

}



long ppc_fadvise64_64(int fd, int advice, u32 offset_high, u32 offset_low,

		      u32 len_high, u32 len_low)

{