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

Commit 2b1c6bd7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Al Viro
Browse files

generic compat_sys_ustat 



Due to a different size of ino_t ustat needs a compat handler, but
currently only x86 and mips provide one.  Add a generic compat_sys_ustat
and switch all architectures over to it.  Instead of doing various
user copy hacks compat_sys_ustat just reimplements sys_ustat as
it's trivial.  This was suggested by Arnd Bergmann.

Found by Eric Sandeen when running xfstests/017 on ppc64, which causes
stack smashing warnings on RHEL/Fedora due to the too large amount of
data writen by the syscall.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent ec1ab0ab

arch/ia64/ia32/ia32_entry.S

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ ia32_syscall_table: 
	data8 sys_ni_syscall

	data8 sys_umask		  /* 60 */

	data8 sys_chroot

	data8 sys_ustat

	data8 compat_sys_ustat

	data8 sys_dup2

	data8 sys_getppid

	data8 sys_getpgrp	  /* 65 */

arch/mips/kernel/linux32.c

+0 −34
Original line number Diff line number Diff line
@@ -356,40 +356,6 @@ SYSCALL_DEFINE1(32_personality, unsigned long, personality) 
	return ret;

}



/* ustat compatibility */

struct ustat32 {

	compat_daddr_t	f_tfree;

	compat_ino_t	f_tinode;

	char		f_fname[6];

	char		f_fpack[6];

};



extern asmlinkage long sys_ustat(dev_t dev, struct ustat __user * ubuf);



SYSCALL_DEFINE2(32_ustat, dev_t, dev, struct ustat32 __user *, ubuf32)

{

	int err;

	struct ustat tmp;

	struct ustat32 tmp32;

	mm_segment_t old_fs = get_fs();



	set_fs(KERNEL_DS);

	err = sys_ustat(dev, (struct ustat __user *)&tmp);

	set_fs(old_fs);



	if (err)

		goto out;



	memset(&tmp32, 0, sizeof(struct ustat32));

	tmp32.f_tfree = tmp.f_tfree;

	tmp32.f_tinode = tmp.f_tinode;



	err = copy_to_user(ubuf32, &tmp32, sizeof(struct ustat32)) ? -EFAULT : 0;



out:

	return err;

}



SYSCALL_DEFINE4(32_sendfile, long, out_fd, long, in_fd,

	compat_off_t __user *, offset, s32, count)

{

arch/mips/kernel/scall64-n32.S

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ EXPORT(sysn32_call_table) 
	PTR	compat_sys_utime		/* 6130 */

	PTR	sys_mknod

	PTR	sys_32_personality

	PTR	sys_32_ustat

	PTR	compat_sys_ustat

	PTR	compat_sys_statfs

	PTR	compat_sys_fstatfs		/* 6135 */

	PTR	sys_sysfs

arch/mips/kernel/scall64-o32.S

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ sys_call_table: 
	PTR	sys_olduname

	PTR	sys_umask			/* 4060 */

	PTR	sys_chroot

	PTR	sys_32_ustat

	PTR	compat_sys_ustat

	PTR	sys_dup2

	PTR	sys_getppid

	PTR	sys_getpgrp			/* 4065 */

arch/parisc/kernel/syscall_table.S

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
	ENTRY_OURS(newuname)

	ENTRY_SAME(umask)		/* 60 */

	ENTRY_SAME(chroot)

	ENTRY_SAME(ustat)

	ENTRY_COMP(ustat)

	ENTRY_SAME(dup2)

	ENTRY_SAME(getppid)

	ENTRY_SAME(getpgrp)		/* 65 */