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

compat: move cp_compat_stat to common code 



struct stat / compat_stat is the same on all architectures, so
cp_compat_stat should be, too.

Turns out it is, except that various architectures have slightly and some
high2lowuid/high2lowgid or the direct assignment instead of the
SET_UID/SET_GID that expands to the correct one anyway.

This patch replaces the arch-specific cp_compat_stat implementations with
a common one based on the x86-64 one.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: David S. Miller <davem@davemloft.net> [ sparc bits ]
Acked-by: Kyle McMartin <kyle@mcmartin.ca> [ parisc bits ]
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f7ad160b

arch/ia64/ia32/sys_ia32.c

+0 −35
Original line number Diff line number Diff line
@@ -118,41 +118,6 @@ sys32_execve (char __user *name, compat_uptr_t __user *argv, compat_uptr_t __use 
	return error;

}



int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf)

{

	compat_ino_t ino;

	int err;



	if ((u64) stat->size > MAX_NON_LFS ||

	    !old_valid_dev(stat->dev) ||

	    !old_valid_dev(stat->rdev))

		return -EOVERFLOW;



	ino = stat->ino;

	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)

		return -EOVERFLOW;



	if (clear_user(ubuf, sizeof(*ubuf)))

		return -EFAULT;



	err  = __put_user(old_encode_dev(stat->dev), &ubuf->st_dev);

	err |= __put_user(ino, &ubuf->st_ino);

	err |= __put_user(stat->mode, &ubuf->st_mode);

	err |= __put_user(stat->nlink, &ubuf->st_nlink);

	err |= __put_user(high2lowuid(stat->uid), &ubuf->st_uid);

	err |= __put_user(high2lowgid(stat->gid), &ubuf->st_gid);

	err |= __put_user(old_encode_dev(stat->rdev), &ubuf->st_rdev);

	err |= __put_user(stat->size, &ubuf->st_size);

	err |= __put_user(stat->atime.tv_sec, &ubuf->st_atime);

	err |= __put_user(stat->atime.tv_nsec, &ubuf->st_atime_nsec);

	err |= __put_user(stat->mtime.tv_sec, &ubuf->st_mtime);

	err |= __put_user(stat->mtime.tv_nsec, &ubuf->st_mtime_nsec);

	err |= __put_user(stat->ctime.tv_sec, &ubuf->st_ctime);

	err |= __put_user(stat->ctime.tv_nsec, &ubuf->st_ctime_nsec);

	err |= __put_user(stat->blksize, &ubuf->st_blksize);

	err |= __put_user(stat->blocks, &ubuf->st_blocks);

	return err;

}



#if PAGE_SHIFT > IA32_PAGE_SHIFT

arch/mips/kernel/linux32.c

+0 −35
Original line number Diff line number Diff line
@@ -63,41 +63,6 @@ 
#define merge_64(r1, r2) ((((r2) & 0xffffffffUL) << 32) + ((r1) & 0xffffffffUL))

#endif



/*

 * Revalidate the inode. This is required for proper NFS attribute caching.

 */



int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)

{

	struct compat_stat tmp;



	if (!new_valid_dev(stat->dev) || !new_valid_dev(stat->rdev))

		return -EOVERFLOW;



	memset(&tmp, 0, sizeof(tmp));

	tmp.st_dev = new_encode_dev(stat->dev);

	tmp.st_ino = stat->ino;

	if (sizeof(tmp.st_ino) < sizeof(stat->ino) && tmp.st_ino != stat->ino)

		return -EOVERFLOW;

	tmp.st_mode = stat->mode;

	tmp.st_nlink = stat->nlink;

	SET_UID(tmp.st_uid, stat->uid);

	SET_GID(tmp.st_gid, stat->gid);

	tmp.st_rdev = new_encode_dev(stat->rdev);

	tmp.st_size = stat->size;

	tmp.st_atime = stat->atime.tv_sec;

	tmp.st_mtime = stat->mtime.tv_sec;

	tmp.st_ctime = stat->ctime.tv_sec;

#ifdef STAT_HAVE_NSEC

	tmp.st_atime_nsec = stat->atime.tv_nsec;

	tmp.st_mtime_nsec = stat->mtime.tv_nsec;

	tmp.st_ctime_nsec = stat->ctime.tv_nsec;

#endif

	tmp.st_blocks = stat->blocks;

	tmp.st_blksize = stat->blksize;

	return copy_to_user(statbuf, &tmp, sizeof(tmp)) ? -EFAULT : 0;

}



asmlinkage unsigned long

sys32_mmap2(unsigned long addr, unsigned long len, unsigned long prot,

         unsigned long flags, unsigned long fd, unsigned long pgoff)

arch/parisc/kernel/sys_parisc32.c

+0 −47
Original line number Diff line number Diff line
@@ -237,53 +237,6 @@ int sys32_settimeofday(struct compat_timeval __user *tv, struct timezone __user 
	return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);

}



int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)

{

	compat_ino_t ino;

	int err;



	if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||

	    !new_valid_dev(stat->rdev))

		return -EOVERFLOW;



	ino = stat->ino;

	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)

		return -EOVERFLOW;



	err  = put_user(new_encode_dev(stat->dev), &statbuf->st_dev);

	err |= put_user(ino, &statbuf->st_ino);

	err |= put_user(stat->mode, &statbuf->st_mode);

	err |= put_user(stat->nlink, &statbuf->st_nlink);

	err |= put_user(0, &statbuf->st_reserved1);

	err |= put_user(0, &statbuf->st_reserved2);

	err |= put_user(new_encode_dev(stat->rdev), &statbuf->st_rdev);

	err |= put_user(stat->size, &statbuf->st_size);

	err |= put_user(stat->atime.tv_sec, &statbuf->st_atime);

	err |= put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);

	err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime);

	err |= put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);

	err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime);

	err |= put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);

	err |= put_user(stat->blksize, &statbuf->st_blksize);

	err |= put_user(stat->blocks, &statbuf->st_blocks);

	err |= put_user(0, &statbuf->__unused1);

	err |= put_user(0, &statbuf->__unused2);

	err |= put_user(0, &statbuf->__unused3);

	err |= put_user(0, &statbuf->__unused4);

	err |= put_user(0, &statbuf->__unused5);

	err |= put_user(0, &statbuf->st_fstype); /* not avail */

	err |= put_user(0, &statbuf->st_realdev); /* not avail */

	err |= put_user(0, &statbuf->st_basemode); /* not avail */

	err |= put_user(0, &statbuf->st_spareshort);

	err |= put_user(stat->uid, &statbuf->st_uid);

	err |= put_user(stat->gid, &statbuf->st_gid);

	err |= put_user(0, &statbuf->st_spare4[0]);

	err |= put_user(0, &statbuf->st_spare4[1]);

	err |= put_user(0, &statbuf->st_spare4[2]);



	return err;

}



/*** copied from mips64 ***/

/*

 * Ooo, nasty.  We need here to frob 32-bit unsigned longs to

arch/powerpc/kernel/sys_ppc32.c

+0 −36
Original line number Diff line number Diff line
@@ -61,42 +61,6 @@ asmlinkage long ppc32_select(u32 n, compat_ulong_t __user *inp, 
	return compat_sys_select((int)n, inp, outp, exp, compat_ptr(tvp_x));

}



int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)

{

	compat_ino_t ino;

	long err;



	if (stat->size > MAX_NON_LFS || !new_valid_dev(stat->dev) ||

	    !new_valid_dev(stat->rdev))

		return -EOVERFLOW;



	ino = stat->ino;

	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)

		return -EOVERFLOW;



	err  = access_ok(VERIFY_WRITE, statbuf, sizeof(*statbuf)) ? 0 : -EFAULT;

	err |= __put_user(new_encode_dev(stat->dev), &statbuf->st_dev);

	err |= __put_user(ino, &statbuf->st_ino);

	err |= __put_user(stat->mode, &statbuf->st_mode);

	err |= __put_user(stat->nlink, &statbuf->st_nlink);

	err |= __put_user(stat->uid, &statbuf->st_uid);

	err |= __put_user(stat->gid, &statbuf->st_gid);

	err |= __put_user(new_encode_dev(stat->rdev), &statbuf->st_rdev);

	err |= __put_user(stat->size, &statbuf->st_size);

	err |= __put_user(stat->atime.tv_sec, &statbuf->st_atime);

	err |= __put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);

	err |= __put_user(stat->mtime.tv_sec, &statbuf->st_mtime);

	err |= __put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);

	err |= __put_user(stat->ctime.tv_sec, &statbuf->st_ctime);

	err |= __put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);

	err |= __put_user(stat->blksize, &statbuf->st_blksize);

	err |= __put_user(stat->blocks, &statbuf->st_blocks);

	err |= __put_user(0, &statbuf->__unused4[0]);

	err |= __put_user(0, &statbuf->__unused4[1]);



	return err;

}



/* Note: it is necessary to treat option as an unsigned int,

 * with the corresponding cast to a signed int to insure that the 

 * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)

arch/s390/kernel/compat_linux.c

+0 −35
Original line number Diff line number Diff line
@@ -362,41 +362,6 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long high, unsigned 
		return sys_ftruncate(fd, (high << 32) | low);

}



int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf)

{

	compat_ino_t ino;

	int err;



	if (!old_valid_dev(stat->dev) || !old_valid_dev(stat->rdev))

		return -EOVERFLOW;



	ino = stat->ino;

	if (sizeof(ino) < sizeof(stat->ino) && ino != stat->ino)

		return -EOVERFLOW;



	err = put_user(old_encode_dev(stat->dev), &statbuf->st_dev);

	err |= put_user(stat->ino, &statbuf->st_ino);

	err |= put_user(stat->mode, &statbuf->st_mode);

	err |= put_user(stat->nlink, &statbuf->st_nlink);

	err |= put_user(high2lowuid(stat->uid), &statbuf->st_uid);

	err |= put_user(high2lowgid(stat->gid), &statbuf->st_gid);

	err |= put_user(old_encode_dev(stat->rdev), &statbuf->st_rdev);

	err |= put_user(stat->size, &statbuf->st_size);

	err |= put_user(stat->atime.tv_sec, &statbuf->st_atime);

	err |= put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);

	err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime);

	err |= put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);

	err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime);

	err |= put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);

	err |= put_user(stat->blksize, &statbuf->st_blksize);

	err |= put_user(stat->blocks, &statbuf->st_blocks);

/* fixme

	err |= put_user(0, &statbuf->__unused4[0]);

	err |= put_user(0, &statbuf->__unused4[1]);

*/

	return err;

}



asmlinkage long sys32_sched_rr_get_interval(compat_pid_t pid,

				struct compat_timespec __user *interval)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE