mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
Merge create_session decoding fix into for-2.6.39
This needs a further fixup!
This commit is contained in:
commit
cf507b6f8e
3 changed files with 10 additions and 9 deletions
|
@ -432,7 +432,7 @@ static int decode_cb_sequence4resok(struct xdr_stream *xdr,
|
|||
* If the server returns different values for sessionID, slotID or
|
||||
* sequence number, the server is looney tunes.
|
||||
*/
|
||||
p = xdr_inline_decode(xdr, NFS4_MAX_SESSIONID_LEN + 4 + 4);
|
||||
p = xdr_inline_decode(xdr, NFS4_MAX_SESSIONID_LEN + 4 + 4 + 4 + 4);
|
||||
if (unlikely(p == NULL))
|
||||
goto out_overflow;
|
||||
memcpy(id.data, p, NFS4_MAX_SESSIONID_LEN);
|
||||
|
|
|
@ -2446,15 +2446,16 @@ nfs4_check_delegmode(struct nfs4_delegation *dp, int flags)
|
|||
static struct nfs4_delegation *
|
||||
find_delegation_file(struct nfs4_file *fp, stateid_t *stid)
|
||||
{
|
||||
struct nfs4_delegation *dp = NULL;
|
||||
struct nfs4_delegation *dp;
|
||||
|
||||
spin_lock(&recall_lock);
|
||||
list_for_each_entry(dp, &fp->fi_delegations, dl_perfile) {
|
||||
if (dp->dl_stateid.si_stateownerid == stid->si_stateownerid)
|
||||
break;
|
||||
}
|
||||
list_for_each_entry(dp, &fp->fi_delegations, dl_perfile)
|
||||
if (dp->dl_stateid.si_stateownerid == stid->si_stateownerid) {
|
||||
spin_unlock(&recall_lock);
|
||||
return dp;
|
||||
}
|
||||
spin_unlock(&recall_lock);
|
||||
return dp;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int share_access_to_flags(u32 share_access)
|
||||
|
|
|
@ -1142,7 +1142,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,
|
|||
|
||||
u32 dummy;
|
||||
char *machine_name;
|
||||
int i;
|
||||
int i, j;
|
||||
int nr_secflavs;
|
||||
|
||||
READ_BUF(16);
|
||||
|
@ -1215,7 +1215,7 @@ nfsd4_decode_create_session(struct nfsd4_compoundargs *argp,
|
|||
READ_BUF(4);
|
||||
READ32(dummy);
|
||||
READ_BUF(dummy * 4);
|
||||
for (i = 0; i < dummy; ++i)
|
||||
for (j = 0; j < dummy; ++j)
|
||||
READ32(dummy);
|
||||
break;
|
||||
case RPC_AUTH_GSS:
|
||||
|
|
Loading…
Reference in a new issue