Return-Path: Received: from mail-ob0-f175.google.com ([209.85.214.175]:33301 "EHLO mail-ob0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752242AbbKCQaU (ORCPT ); Tue, 3 Nov 2015 11:30:20 -0500 Received: by obbwb3 with SMTP id wb3so16851525obb.0 for ; Tue, 03 Nov 2015 08:30:19 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <1446563847-14005-48-git-send-email-agruenba@redhat.com> References: <1446563847-14005-1-git-send-email-agruenba@redhat.com> <1446563847-14005-48-git-send-email-agruenba@redhat.com> Date: Tue, 3 Nov 2015 11:30:19 -0500 Message-ID: Subject: Re: [PATCH v13 47/51] nfs: Fix GETATTR bitmap verification From: Trond Myklebust To: Andreas Gruenbacher Cc: Alexander Viro , "Theodore Ts'o" , Andreas Dilger , "J. Bruce Fields" , Jeff Layton , Anna Schumaker , Dave Chinner , linux-ext4@vger.kernel.org, xfs@oss.sgi.com, Linux Kernel Mailing List , Linux FS-devel Mailing List , Linux NFS Mailing List , linux-cifs@vger.kernel.org, Linux API Mailing List Content-Type: text/plain; charset=UTF-8 Sender: linux-nfs-owner@vger.kernel.org List-ID: On Tue, Nov 3, 2015 at 10:17 AM, Andreas Gruenbacher wrote: > When decoding GETATTR replies, the client checks the attribute bitmap > for which attributes the server has sent. It misses bits at the word > boundaries, though; fix that. > > Signed-off-by: Andreas Gruenbacher > --- > fs/nfs/nfs4xdr.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c > index 788adf3..6f6d921 100644 > --- a/fs/nfs/nfs4xdr.c > +++ b/fs/nfs/nfs4xdr.c > @@ -4375,6 +4375,11 @@ static int decode_statfs(struct xdr_stream *xdr, struct nfs_fsstat *fsstat) > goto xdr_error; > if ((status = decode_attr_files_total(xdr, bitmap, &fsstat->tfiles)) != 0) > goto xdr_error; > + > + status = -EIO; > + if (unlikely(bitmap[0])) > + goto xdr_error; > + > if ((status = decode_attr_space_avail(xdr, bitmap, &fsstat->abytes)) != 0) > goto xdr_error; > if ((status = decode_attr_space_free(xdr, bitmap, &fsstat->fbytes)) != 0) > @@ -4574,6 +4579,10 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap, > goto xdr_error; > fattr->valid |= status; > > + status = -EIO; > + if (unlikely(bitmap[0])) > + goto xdr_error; > + > status = decode_attr_mode(xdr, bitmap, &fmode); > if (status < 0) > goto xdr_error; > @@ -4627,6 +4636,10 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap, > goto xdr_error; > fattr->valid |= status; > > + status = -EIO; > + if (unlikely(bitmap[1])) > + goto xdr_error; > + > status = decode_attr_mdsthreshold(xdr, bitmap, fattr->mdsthreshold); > if (status < 0) > goto xdr_error; > @@ -4789,12 +4802,22 @@ static int decode_fsinfo(struct xdr_stream *xdr, struct nfs_fsinfo *fsinfo) > if ((status = decode_attr_maxwrite(xdr, bitmap, &fsinfo->wtmax)) != 0) > goto xdr_error; > fsinfo->wtpref = fsinfo->wtmax; > + > + status = -EIO; > + if (unlikely(bitmap[0])) > + goto xdr_error; > + > status = decode_attr_time_delta(xdr, bitmap, &fsinfo->time_delta); > if (status != 0) > goto xdr_error; > status = decode_attr_pnfstype(xdr, bitmap, &fsinfo->layouttype); > if (status != 0) > goto xdr_error; > + > + status = -EIO; > + if (unlikely(bitmap[1])) > + goto xdr_error; > + > status = decode_attr_layout_blksize(xdr, bitmap, &fsinfo->blksize); > if (status) > goto xdr_error; > -- > 2.5.0 This patch can and should be merged separately from this patchset. Please submit it through the usual channels. Trond