linux-kernel - Re: [PATCH 05/38] whiteout/NFSD: Don't return information about whiteouts to userspace

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20100806233641.GG29536@fieldses.org>
Date:	Fri, 6 Aug 2010 19:36:41 -0400
From:	"J. Bruce Fields" <bfields@...ldses.org>
To:	Valerie Aurora <vaurora@...hat.com>
Cc:	Alexander Viro <viro@...iv.linux.org.uk>,
	Miklos Szeredi <miklos@...redi.hu>,
	Jan Blunck <jblunck@...e.de>,
	Christoph Hellwig <hch@...radead.org>,
	linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org,
	David Woodhouse <dwmw2@...radead.org>,
	linux-nfs@...r.kernel.org, Neil Brown <neilb@...e.de>
Subject: Re: [PATCH 05/38] whiteout/NFSD: Don't return information about
 whiteouts to userspace

On Fri, Aug 06, 2010 at 03:34:51PM -0700, Valerie Aurora wrote:
> From: Jan Blunck <jblunck@...e.de>
> 
> Userspace isn't ready for handling another file type, so silently drop
> whiteout directory entries before they leave the kernel.
> 
> Signed-off-by: Jan Blunck <jblunck@...e.de>
> Signed-off-by: David Woodhouse <dwmw2@...radead.org>
> Signed-off-by: Valerie Aurora <vaurora@...hat.com>
> Cc: linux-nfs@...r.kernel.org
> Cc: "J. Bruce Fields" <bfields@...ldses.org>

For what it's worth:

	Acked-by: J. Bruce Fields <bfields@...hat.com>

(Like Neil I kinda hoped we wouldn't need the check in every callback,
but probably you're right that it wouldn't be worth the extra layer of
indirection.)

--b.

> Cc: Neil Brown <neilb@...e.de>
> ---
>  fs/compat.c       |    9 +++++++++
>  fs/nfsd/nfs3xdr.c |    5 +++++
>  fs/nfsd/nfs4xdr.c |    5 +++++
>  fs/nfsd/nfsxdr.c  |    4 ++++
>  fs/readdir.c      |    9 +++++++++
>  5 files changed, 32 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/compat.c b/fs/compat.c
> index 6490d21..7e7b3a4 100644
> --- a/fs/compat.c
> +++ b/fs/compat.c
> @@ -912,6 +912,9 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen,
>  	struct compat_old_linux_dirent __user *dirent;
>  	compat_ulong_t d_ino;
>  
> +	if (d_type == DT_WHT)
> +		return 0;
> +
>  	if (buf->result)
>  		return -EINVAL;
>  	d_ino = ino;
> @@ -983,6 +986,9 @@ static int compat_filldir(void *__buf, const char *name, int namlen,
>  	compat_ulong_t d_ino;
>  	int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 2, sizeof(compat_long_t));
>  
> +	if (d_type == DT_WHT)
> +		return 0;
> +
>  	buf->error = -EINVAL;	/* only used if we fail.. */
>  	if (reclen > buf->count)
>  		return -EINVAL;
> @@ -1072,6 +1078,9 @@ static int compat_filldir64(void * __buf, const char * name, int namlen, loff_t
>  	int reclen = ALIGN(jj + namlen + 1, sizeof(u64));
>  	u64 off;
>  
> +	if (d_type == DT_WHT)
> +		return 0;
> +
>  	buf->error = -EINVAL;	/* only used if we fail.. */
>  	if (reclen > buf->count)
>  		return -EINVAL;
> diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c
> index 2a533a0..9b96f5a 100644
> --- a/fs/nfsd/nfs3xdr.c
> +++ b/fs/nfsd/nfs3xdr.c
> @@ -885,6 +885,11 @@ encode_entry(struct readdir_cd *ccd, const char *name, int namlen,
>  	int		elen;		/* estimated entry length in words */
>  	int		num_entry_words = 0;	/* actual number of words */
>  
> +	if (d_type == DT_WHT) {
> +		cd->common.err = nfs_ok;
> +		return 0;
> +	}
> +
>  	if (cd->offset) {
>  		u64 offset64 = offset;
>  
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index ac17a70..fb67254 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -2279,6 +2279,11 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen,
>  		return 0;
>  	}
>  
> +	if (d_type == DT_WHT) {
> +		cd->common.err = nfs_ok;
> +		return 0;
> +	}
> +
>  	if (cd->offset)
>  		xdr_encode_hyper(cd->offset, (u64) offset);
>  
> diff --git a/fs/nfsd/nfsxdr.c b/fs/nfsd/nfsxdr.c
> index 4ce005d..0e57d4b 100644
> --- a/fs/nfsd/nfsxdr.c
> +++ b/fs/nfsd/nfsxdr.c
> @@ -503,6 +503,10 @@ nfssvc_encode_entry(void *ccdv, const char *name,
>  			namlen, name, offset, ino);
>  	 */
>  
> +	if (d_type == DT_WHT) {
> +		cd->common.err = nfs_ok;
> +		return 0;
> +	}
>  	if (offset > ~((u32) 0)) {
>  		cd->common.err = nfserr_fbig;
>  		return -EINVAL;
> diff --git a/fs/readdir.c b/fs/readdir.c
> index 7723401..3a48491 100644
> --- a/fs/readdir.c
> +++ b/fs/readdir.c
> @@ -77,6 +77,9 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset
>  	struct old_linux_dirent __user * dirent;
>  	unsigned long d_ino;
>  
> +	if (d_type == DT_WHT)
> +		return 0;
> +
>  	if (buf->result)
>  		return -EINVAL;
>  	d_ino = ino;
> @@ -154,6 +157,9 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset,
>  	unsigned long d_ino;
>  	int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 2, sizeof(long));
>  
> +	if (d_type == DT_WHT)
> +		return 0;
> +
>  	buf->error = -EINVAL;	/* only used if we fail.. */
>  	if (reclen > buf->count)
>  		return -EINVAL;
> @@ -239,6 +245,9 @@ static int filldir64(void * __buf, const char * name, int namlen, loff_t offset,
>  	struct getdents_callback64 * buf = (struct getdents_callback64 *) __buf;
>  	int reclen = ALIGN(NAME_OFFSET(dirent) + namlen + 1, sizeof(u64));
>  
> +	if (d_type == DT_WHT)
> +		return 0;
> +
>  	buf->error = -EINVAL;	/* only used if we fail.. */
>  	if (reclen > buf->count)
>  		return -EINVAL;
> -- 
> 1.6.3.3
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/