Commit afefdbb2 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

[PATCH] VFS: Make filldir_t and struct kstat deal in 64-bit inode numbers 



These patches make the kernel pass 64-bit inode numbers internally when
communicating to userspace, even on a 32-bit system.  They are required
because some filesystems have intrinsic 64-bit inode numbers: NFS3+ and XFS
for example.  The 64-bit inode numbers are then propagated to userspace
automatically where the arch supports it.

Problems have been seen with userspace (eg: ld.so) using the 64-bit inode
number returned by stat64() or getdents64() to differentiate files, and
failing because the 64-bit inode number space was compressed to 32-bits, and
so overlaps occur.

This patch:

Make filldir_t take a 64-bit inode number and struct kstat carry a 64-bit
inode number so that 64-bit inode numbers can be passed back to userspace.

The stat functions then returns the full 64-bit inode number where
available and where possible.  If it is not possible to represent the inode
number supplied by the filesystem in the field provided by userspace, then
error EOVERFLOW will be issued.

Similarly, the getdents/readdir functions now pass the full 64-bit inode
number to userspace where possible, returning EOVERFLOW instead when a
directory entry is encountered that can't be properly represented.

Note that this means that some inodes will not be stat'able on a 32-bit
system with old libraries where they were before - but it does mean that
there will be no ambiguity over what a 32-bit inode number refers to.

Note similarly that directory scans may be cut short with an error on a
32-bit system with old libraries where the scan would work before for the
same reasons.

It is judged unlikely that this situation will occur because modern glibc
uses 64-bit capable versions of stat and getdents class functions
exclusively, and that older systems are unlikely to encounter
unrepresentable inode numbers anyway.

[akpm: alpha build fix]
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1d32849b

arch/alpha/kernel/osf_sys.c

+6 −2
Original line number Diff line number Diff line
@@ -111,22 +111,26 @@ struct osf_dirent_callback { 


static int

osf_filldir(void *__buf, const char *name, int namlen, loff_t offset,

	    ino_t ino, unsigned int d_type)

	    u64 ino, unsigned int d_type)

{

	struct osf_dirent __user *dirent;

	struct osf_dirent_callback *buf = (struct osf_dirent_callback *) __buf;

	unsigned int reclen = ROUND_UP(NAME_OFFSET + namlen + 1);

	unsigned int d_ino;



	buf->error = -EINVAL;	/* only used if we fail */

	if (reclen > buf->count)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

		return -EOVERFLOW;

	if (buf->basep) {

		if (put_user(offset, buf->basep))

			return -EFAULT;

		buf->basep = NULL;

	}

	dirent = buf->dirent;

	put_user(ino, &dirent->d_ino);

	put_user(d_ino, &dirent->d_ino);

	put_user(namlen, &dirent->d_namlen);

	put_user(reclen, &dirent->d_reclen);

	if (copy_to_user(dirent->d_name, name, namlen) ||

arch/ia64/ia32/sys_ia32.c

+18 −5
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ sys32_execve (char __user *name, compat_uptr_t __user *argv, compat_uptr_t __use 


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 ||
@@ -132,11 +133,15 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *ubuf) 
	    !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(stat->ino, &ubuf->st_ino);

	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);
@@ -1222,16 +1227,20 @@ struct readdir32_callback { 
};



static int

filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino,

filldir32 (void *__buf, const char *name, int namlen, loff_t offset, u64 ino,

	   unsigned int d_type)

{

	struct compat_dirent __user * dirent;

	struct getdents32_callback * buf = (struct getdents32_callback *) __buf;

	int reclen = ROUND_UP(offsetof(struct compat_dirent, d_name) + namlen + 1, 4);

	u32 d_ino;



	buf->error = -EINVAL;	/* only used if we fail.. */

	if (reclen > buf->count)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

		return -EOVERFLOW;

	buf->error = -EFAULT;	/* only used if we fail.. */

	dirent = buf->previous;

	if (dirent)
@@ -1239,7 +1248,7 @@ filldir32 (void *__buf, const char *name, int namlen, loff_t offset, ino_t ino, 
			return -EFAULT;

	dirent = buf->current_dir;

	buf->previous = dirent;

	if (put_user(ino, &dirent->d_ino)

	if (put_user(d_ino, &dirent->d_ino)

	    || put_user(reclen, &dirent->d_reclen)

	    || copy_to_user(dirent->d_name, name, namlen)

	    || put_user(0, dirent->d_name + namlen))
@@ -1287,17 +1296,21 @@ out: 
}



static int

fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, ino_t ino,

fillonedir32 (void * __buf, const char * name, int namlen, loff_t offset, u64 ino,

	      unsigned int d_type)

{

	struct readdir32_callback * buf = (struct readdir32_callback *) __buf;

	struct old_linux32_dirent __user * dirent;

	u32 d_ino;



	if (buf->count)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

		return -EOVERFLOW;

	buf->count++;

	dirent = buf->dirent;

	if (put_user(ino, &dirent->d_ino)

	if (put_user(d_ino, &dirent->d_ino)

	    || put_user(offset, &dirent->d_offset)

	    || put_user(namlen, &dirent->d_namlen)

	    || copy_to_user(dirent->d_name, name, namlen)

arch/mips/kernel/linux32.c

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ int cp_compat_stat(struct kstat *stat, struct compat_stat __user *statbuf) 
	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);

arch/mips/kernel/sysirix.c

+7 −3
Original line number Diff line number Diff line
@@ -1739,12 +1739,13 @@ struct irix_dirent32_callback { 
#define ROUND_UP32(x) (((x)+sizeof(u32)-1) & ~(sizeof(u32)-1))



static int irix_filldir32(void *__buf, const char *name,

	int namlen, loff_t offset, ino_t ino, unsigned int d_type)

	int namlen, loff_t offset, u64 ino, unsigned int d_type)

{

	struct irix_dirent32 __user *dirent;

	struct irix_dirent32_callback *buf = __buf;

	unsigned short reclen = ROUND_UP32(NAME_OFFSET32(dirent) + namlen + 1);

	int err = 0;

	u32 d_ino;



#ifdef DEBUG_GETDENTS

	printk("\nirix_filldir32[reclen<%d>namlen<%d>count<%d>]",
@@ -1753,12 +1754,15 @@ static int irix_filldir32(void *__buf, const char *name, 
	buf->error = -EINVAL;	/* only used if we fail.. */

	if (reclen > buf->count)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

		return -EOVERFLOW;

	dirent = buf->previous;

	if (dirent)

		err = __put_user(offset, &dirent->d_off);

	dirent = buf->current_dir;

	err |= __put_user(dirent, &buf->previous);

	err |= __put_user(ino, &dirent->d_ino);

	err |= __put_user(d_ino, &dirent->d_ino);

	err |= __put_user(reclen, &dirent->d_reclen);

	err |= copy_to_user((char __user *)dirent->d_name, name, namlen) ? -EFAULT : 0;

	err |= __put_user(0, &dirent->d_name[namlen]);
@@ -1837,7 +1841,7 @@ struct irix_dirent64_callback { 
#define ROUND_UP64(x) (((x)+sizeof(u64)-1) & ~(sizeof(u64)-1))



static int irix_filldir64(void *__buf, const char *name,

	int namlen, loff_t offset, ino_t ino, unsigned int d_type)

	int namlen, loff_t offset, u64 ino, unsigned int d_type)

{

	struct irix_dirent64 __user *dirent;

	struct irix_dirent64_callback * buf = __buf;

arch/parisc/hpux/fs.c

+5 −1
Original line number Diff line number Diff line
@@ -77,17 +77,21 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, 
{

	struct hpux_dirent * dirent;

	struct getdents_callback * buf = (struct getdents_callback *) __buf;

	ino_t d_ino;

	int reclen = ROUND_UP(NAME_OFFSET(dirent) + namlen + 1);



	buf->error = -EINVAL;	/* only used if we fail.. */

	if (reclen > buf->count)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

		return -EOVERFLOW;

	dirent = buf->previous;

	if (dirent)

		put_user(offset, &dirent->d_off);

	dirent = buf->current_dir;

	buf->previous = dirent;

	put_user(ino, &dirent->d_ino);

	put_user(d_ino, &dirent->d_ino);

	put_user(reclen, &dirent->d_reclen);

	put_user(namlen, &dirent->d_namlen);

	copy_to_user(dirent->d_name, name, namlen);

CRA Git | Maintained and supported by SUSTech CRA and CCSE