Commit bf5c43c8 authored by J. Bruce Fields's avatar J. Bruce Fields

nfsd4: check for uninitialized slot

This fixes an oops when a buggy client tries to use an initial seqid of
0 on a new slot, which we may misinterpret as a replay.
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 73e79482
...@@ -1347,6 +1347,7 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp) ...@@ -1347,6 +1347,7 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)
slot->sl_opcnt = resp->opcnt; slot->sl_opcnt = resp->opcnt;
slot->sl_status = resp->cstate.status; slot->sl_status = resp->cstate.status;
slot->sl_flags |= NFSD4_SLOT_INITIALIZED;
if (nfsd4_not_cached(resp)) { if (nfsd4_not_cached(resp)) {
slot->sl_datalen = 0; slot->sl_datalen = 0;
return; return;
...@@ -1916,6 +1917,9 @@ nfsd4_sequence(struct svc_rqst *rqstp, ...@@ -1916,6 +1917,9 @@ nfsd4_sequence(struct svc_rqst *rqstp,
status = check_slot_seqid(seq->seqid, slot->sl_seqid, status = check_slot_seqid(seq->seqid, slot->sl_seqid,
slot->sl_flags & NFSD4_SLOT_INUSE); slot->sl_flags & NFSD4_SLOT_INUSE);
if (status == nfserr_replay_cache) { if (status == nfserr_replay_cache) {
status = nfserr_seq_misordered;
if (!(slot->sl_flags & NFSD4_SLOT_INITIALIZED))
goto out;
cstate->slot = slot; cstate->slot = slot;
cstate->session = session; cstate->session = session;
/* Return the cached reply status and set cstate->status /* Return the cached reply status and set cstate->status
...@@ -1932,9 +1936,11 @@ nfsd4_sequence(struct svc_rqst *rqstp, ...@@ -1932,9 +1936,11 @@ nfsd4_sequence(struct svc_rqst *rqstp,
/* Success! bump slot seqid */ /* Success! bump slot seqid */
slot->sl_seqid = seq->seqid; slot->sl_seqid = seq->seqid;
slot->sl_flags = NFSD4_SLOT_INUSE; slot->sl_flags |= NFSD4_SLOT_INUSE;
if (seq->cachethis) if (seq->cachethis)
slot->sl_flags |= NFSD4_SLOT_CACHETHIS; slot->sl_flags |= NFSD4_SLOT_CACHETHIS;
else
slot->sl_flags &= ~NFSD4_SLOT_CACHETHIS;
cstate->slot = slot; cstate->slot = slot;
cstate->session = session; cstate->session = session;
......
...@@ -134,6 +134,7 @@ struct nfsd4_slot { ...@@ -134,6 +134,7 @@ struct nfsd4_slot {
u16 sl_opcnt; u16 sl_opcnt;
#define NFSD4_SLOT_INUSE (1 << 0) #define NFSD4_SLOT_INUSE (1 << 0)
#define NFSD4_SLOT_CACHETHIS (1 << 1) #define NFSD4_SLOT_CACHETHIS (1 << 1)
#define NFSD4_SLOT_INITIALIZED (1 << 2)
u8 sl_flags; u8 sl_flags;
char sl_data[]; char sl_data[];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment