From: Andreas Gruenbacher <agruenba@redhat.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
"Theodore Ts'o" <tytso@mit.edu>,
Andreas Dilger <adilger.kernel@dilger.ca>,
"J. Bruce Fields" <bfields@fieldses.org>,
Jeff Layton <jlayton@poochiereds.net>,
Trond Myklebust <trond.myklebust@primarydata.com>,
Anna Schumaker <anna.schumaker@netapp.com>,
Dave Chinner <david@fromorbit.com>,
linux-ext4@vger.kernel.org, xfs@oss.sgi.com,
linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org,
linux-api@vger.kernel.org
Cc: Andreas Gruenbacher <agruenba@redhat.com>
Subject: [PATCH v12 45/49] nfs: Fix GETATTR bitmap verification
Date: Fri, 23 Oct 2015 20:41:58 +0200 [thread overview]
Message-ID: <1445625722-13791-46-git-send-email-agruenba@redhat.com> (raw)
In-Reply-To: <1445625722-13791-1-git-send-email-agruenba@redhat.com>
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 <agruenba@redhat.com>
---
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
next prev parent reply other threads:[~2015-10-23 18:47 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-23 18:41 [PATCH v12 00/49] Richacls Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 01/49] vfs: Add IS_ACL() and IS_RICHACL() tests Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 02/49] vfs: Add MAY_CREATE_FILE and MAY_CREATE_DIR permission flags Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 03/49] vfs: Add MAY_DELETE_SELF and MAY_DELETE_CHILD " Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 04/49] vfs: Make the inode passed to inode_change_ok non-const Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 05/49] vfs: Add permission flags for setting file attributes Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 06/49] richacl: In-memory representation and helper functions Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 07/49] richacl: Permission mapping functions Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 08/49] richacl: Compute maximum file masks from an acl Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 09/49] richacl: Permission check algorithm Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 10/49] vfs: Cache base_acl objects in inodes Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 11/49] vfs: Add get_richacl and set_richacl inode operations Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 12/49] vfs: Cache richacl in struct inode Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 13/49] richacl: Update the file masks in chmod() Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 14/49] richacl: Check if an acl is equivalent to a file mode Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 15/49] richacl: Create-time inheritance Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 16/49] richacl: Automatic Inheritance Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 17/49] richacl: xattr mapping functions Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 18/49] richacl: Add richacl xattr handler Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 19/49] vfs: Add richacl permission checking Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 20/49] ext4: Add richacl support Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 21/49] ext4: Add richacl feature flag Andreas Gruenbacher
2015-10-23 19:34 ` Austin S Hemmelgarn
2015-10-23 18:41 ` [PATCH v12 22/49] xfs: Fix error path in xfs_get_acl Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 23/49] xfs: Make xfs_set_mode non-static Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 24/49] xfs: Change how listxattr generates synthetic attributes Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 25/49] xfs: Add richacl support Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 26/49] richacl: acl editing helper functions Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 27/49] richacl: Move everyone@ aces down the acl Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 28/49] richacl: Propagate everyone@ permissions to other aces Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 29/49] richacl: Set the owner permissions to the owner mask Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 30/49] richacl: Set the other permissions to the other mask Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 31/49] richacl: Isolate the owner and group classes Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 32/49] richacl: Apply the file masks to a richacl Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 33/49] richacl: Create richacl from mode values Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 34/49] nfsd: Keep list of acls to dispose of in compoundargs Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 35/49] nfsd: Use richacls as internal acl representation Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 36/49] nfsd: Add richacl support Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 37/49] nfsd: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 38/49] nfsd: Add support for the MAY_CREATE_{FILE,DIR} permissions Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 39/49] richacl: Add support for unmapped identifiers Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 40/49] nfsd: Add support for unmapped richace identifiers Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 41/49] ext4: Don't allow unmapped identifiers in richacls Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 42/49] xfs: " Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 43/49] sunrpc: Allow to demand-allocate pages to encode into Andreas Gruenbacher
2015-10-23 18:41 ` [PATCH v12 44/49] sunrpc: Add xdr_init_encode_pages Andreas Gruenbacher
2015-10-23 18:41 ` Andreas Gruenbacher [this message]
2015-10-23 18:41 ` [PATCH v12 46/49] nfs: Remove unused xdr page offsets in getacl/setacl arguments Andreas Gruenbacher
2015-10-23 18:42 ` [PATCH v12 47/49] nfs: Distinguish missing users and groups from nobody Andreas Gruenbacher
2015-10-23 18:42 ` [PATCH v12 48/49] nfs: Add richacl support Andreas Gruenbacher
2015-10-23 18:42 ` [PATCH v12 49/49] nfs: Add support for the v4.1 dacl attribute Andreas Gruenbacher
2015-10-23 20:03 ` [PATCH v12 00/49] Richacls Frank Filz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445625722-13791-46-git-send-email-agruenba@redhat.com \
--to=agruenba@redhat.com \
--cc=adilger.kernel@dilger.ca \
--cc=anna.schumaker@netapp.com \
--cc=bfields@fieldses.org \
--cc=david@fromorbit.com \
--cc=jlayton@poochiereds.net \
--cc=linux-api@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).