On 2010-10-01 16:48, J. Bruce Fields wrote: > On Thu, Sep 30, 2010 at 08:47:58PM +0200, Benny Halevy wrote: >> These attributes are valid in NFSv4.1, the just doesn't support them yet. > > The existing code handles unsupported attributes in the operations > themselves. Perhaps it makes sense to move those checks here, but if > so, explain why, and let's do this for all unsupported attributes, not > just these two. The client can run a DOS attack on the server by requesting invalid attributes and tripping the BUG_ONs in nfsd4_encode_fattr. We can/should also change the BUG_ONs to either report invalid attribute or just silently ignore them, but the client is perfectly entitled to get attrs we don't support :) > > Looking back at the spec.... I guess it's only on operations that set > attributes that we return NFS4ERR_ATTRNOTSUPP, and otherwise we silently > ignore them? For the GETATTR case, we just return the attrmask for the attrs we support. IOW: The server returns an attribute bitmap that indicates the attribute values that it was able to return, which will include all attributes requested by the client that are attributes supported by the server for the target file system. Benny > > --b. > >> >> Signed-off-by: Benny Halevy <bhalevy@xxxxxxxxxxx> >> --- >> fs/nfsd/nfs4xdr.c | 4 ++++ >> 1 files changed, 4 insertions(+), 0 deletions(-) >> >> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c >> index f48d891..bd4ce68 100644 >> --- a/fs/nfsd/nfs4xdr.c >> +++ b/fs/nfsd/nfs4xdr.c >> @@ -1761,6 +1761,10 @@ nfsd4_encode_fattr(struct svc_fh *fhp, struct svc_export *exp, >> .dentry = dentry, >> }; >> >> + /* mask out unsupported pNFS attributes */ >> + bmval1 &= ~FATTR4_WORD1_FS_LAYOUT_TYPES; >> + bmval2 &= ~FATTR4_WORD2_LAYOUT_BLKSIZE; >> + >> BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1); >> BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion)); >> BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion)); >> -- >> 1.7.2.3 >> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
