]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
nfsd4: ignore WANT bits in open downgrade
authorJ. Bruce Fields <bfields@redhat.com>
Mon, 10 Oct 2011 21:34:31 +0000 (17:34 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 7 Nov 2011 20:32:30 +0000 (12:32 -0800)
commit c30e92df30d7d5fe65262fbce5d1b7de675fe34e upstream.

We don't use WANT bits yet--and sending them can probably trigger a
BUG() further down.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/nfsd/nfs4state.c

index 6ad6282e3076f4d16b6ff134253ac8a59b456063..cfc339193fb799c257e7b2db6864664b9f4f7060 100644 (file)
@@ -3079,6 +3079,8 @@ nfsd4_open_downgrade(struct svc_rqst *rqstp,
        if (!access_valid(od->od_share_access, cstate->minorversion)
                        || !deny_valid(od->od_share_deny))
                return nfserr_inval;
+       /* We don't yet support WANT bits: */
+       od->od_share_access &= NFS4_SHARE_ACCESS_MASK;
 
        nfs4_lock_state();
        if ((status = nfs4_preprocess_seqid_op(cstate,