2014-05-28 08:43:59

by Christoph Hellwig

Subject: [PATCH] nfsd: getattr for FATTR4_WORD0_FILES_AVAIL needs the statfs buffer

Signed-off-by: Christoph Hellwig <[email protected]>
---
fs/nfsd/nfs4xdr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index d23412e..4bfe880c 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -2049,8 +2049,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
err = vfs_getattr(&path, &stat);
if (err)
goto out_nfserr;
- if ((bmval0 & (FATTR4_WORD0_FILES_FREE | FATTR4_WORD0_FILES_TOTAL |
- FATTR4_WORD0_MAXNAME)) ||
+ if ((bmval0 & (FATTR4_WORD0_FILES_AVAIL | FATTR4_WORD0_FILES_FREE |
+ FATTR4_WORD0_FILES_TOTAL | FATTR4_WORD0_MAXNAME)) ||
(bmval1 & (FATTR4_WORD1_SPACE_AVAIL | FATTR4_WORD1_SPACE_FREE |
FATTR4_WORD1_SPACE_TOTAL))) {
err = vfs_statfs(&path, &statfs);
--
1.7.10.4

2014-05-28 19:36:01

by J. Bruce Fields

Subject: Re: [PATCH] nfsd: getattr for FATTR4_WORD0_FILES_AVAIL needs the statfs buffer

Thanks, applying for 3.16 and stable.

But, I don't get it: we've been returning random uninitialized data in
FILES_AVAIL since forever, and nobody's noticed till now?

Oh, I see: probably every client requests at least one other thing on
that list at the same time it requests FILES_AVAIL.

--b.

On Wed, May 28, 2014 at 10:46:13AM +0200, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <[email protected]>
> ---
> fs/nfsd/nfs4xdr.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index d23412e..4bfe880c 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -2049,8 +2049,8 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
> err = vfs_getattr(&path, &stat);
> if (err)
> goto out_nfserr;
> - if ((bmval0 & (FATTR4_WORD0_FILES_FREE | FATTR4_WORD0_FILES_TOTAL |
> - FATTR4_WORD0_MAXNAME)) ||
> + if ((bmval0 & (FATTR4_WORD0_FILES_AVAIL | FATTR4_WORD0_FILES_FREE |
> + FATTR4_WORD0_FILES_TOTAL | FATTR4_WORD0_MAXNAME)) ||
> (bmval1 & (FATTR4_WORD1_SPACE_AVAIL | FATTR4_WORD1_SPACE_FREE |
> FATTR4_WORD1_SPACE_TOTAL))) {
> err = vfs_statfs(&path, &statfs);
> --
> 1.7.10.4
>

2014-05-28 19:38:05

by Christoph Hellwig

Subject: Re: [PATCH] nfsd: getattr for FATTR4_WORD0_FILES_AVAIL needs the statfs buffer

On Wed, May 28, 2014 at 03:35:55PM -0400, J. Bruce Fields wrote:
> Thanks, applying for 3.16 and stable.
>
> But, I don't get it: we've been returning random uninitialized data in
> FILES_AVAIL since forever, and nobody's noticed till now?
>
> Oh, I see: probably every client requests at least one other thing on
> that list at the same time it requests FILES_AVAIL.

Yeah. I only found this when prototyping schemes to split
nfsd4_encode_fattr into easier manageable chunks.