Skip to content

Commit 560c031

Browse files
Olga Kornievskaiagregkh
authored andcommitted
NFSD: fix decoding in nfs4_xdr_dec_cb_getattr
commit 1b3e26a upstream. If a client were to send an error to a CB_GETATTR call, the code erronously continues to try decode past the error code. It ends up returning BAD_XDR error to the rpc layer and then in turn trigger a WARN_ONCE in nfsd4_cb_done() function. Fixes: 6487a13 ("NFSD: add support for CB_GETATTR callback") Signed-off-by: Olga Kornievskaia <[email protected]> Reviewed-by: Jeff Layton <[email protected]> Reviewed-by: Benjamin Coddington <[email protected]> Signed-off-by: Chuck Lever <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 7005fdc commit 560c031

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/nfsd/nfs4callback.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ static int nfs4_xdr_dec_cb_getattr(struct rpc_rqst *rqstp,
605605
return status;
606606

607607
status = decode_cb_op_status(xdr, OP_CB_GETATTR, &cb->cb_status);
608-
if (status)
608+
if (unlikely(status || cb->cb_seq_status))
609609
return status;
610610
if (xdr_stream_decode_uint32_array(xdr, bitmap, 3) < 0)
611611
return -NFSERR_BAD_XDR;

0 commit comments

Comments
 (0)