openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Fix SECINFO_NO_NAME 

I was using the same decoder function for SECINFO and SECINFO_NO_NAME,
so it was returning an error when it tried to decode an OP_SECINFO_NO_NAME
header as OP_SECINFO.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Bryan Schumaker 2012-04-27 13:27:38 -04:00 committed by Trond Myklebust
parent ea8cfa0679
commit 31e4dda474
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
fs/nfs/nfs4xdr.c
View File

@ -5094,16 +5094,13 @@ static int decode_secinfo_gss(struct xdr_stream *xdr, struct nfs4_secinfo_flavor
return -EINVAL; return -EINVAL;
} }
static int decode_secinfo(struct xdr_stream *xdr, struct nfs4_secinfo_res *res) static int decode_secinfo_common(struct xdr_stream *xdr, struct nfs4_secinfo_res *res)
{ {
struct nfs4_secinfo_flavor *sec_flavor; struct nfs4_secinfo_flavor *sec_flavor;
int status; int status;
__be32 *p; __be32 *p;
int i, num_flavors; int i, num_flavors;
status = decode_op_hdr(xdr, OP_SECINFO);
if (status)
goto out;
p = xdr_inline_decode(xdr, 4); p = xdr_inline_decode(xdr, 4);
if (unlikely(!p)) if (unlikely(!p))
goto out_overflow; goto out_overflow;
@ -5129,6 +5126,7 @@ static int decode_secinfo(struct xdr_stream *xdr, struct nfs4_secinfo_res *res)
res->flavors->num_flavors++; res->flavors->num_flavors++;
} }
status = 0;
out: out:
return status; return status;
out_overflow: out_overflow:
@ -5136,7 +5134,23 @@ static int decode_secinfo(struct xdr_stream *xdr, struct nfs4_secinfo_res *res)
return -EIO; return -EIO;
} }
static int decode_secinfo(struct xdr_stream *xdr, struct nfs4_secinfo_res *res)
{
int status = decode_op_hdr(xdr, OP_SECINFO);
if (status)
return status;
return decode_secinfo_common(xdr, res);
}
#if defined(CONFIG_NFS_V4_1) #if defined(CONFIG_NFS_V4_1)
static int decode_secinfo_no_name(struct xdr_stream *xdr, struct nfs4_secinfo_res *res)
{
int status = decode_op_hdr(xdr, OP_SECINFO_NO_NAME);
if (status)
return status;
return decode_secinfo_common(xdr, res);
}
static int decode_exchange_id(struct xdr_stream *xdr, static int decode_exchange_id(struct xdr_stream *xdr,
struct nfs41_exchange_id_res *res) struct nfs41_exchange_id_res *res)
{ {
@ -6821,7 +6835,7 @@ static int nfs4_xdr_dec_secinfo_no_name(struct rpc_rqst *rqstp,
status = decode_putrootfh(xdr); status = decode_putrootfh(xdr);
if (status) if (status)
goto out; goto out;
status = decode_secinfo(xdr, res); status = decode_secinfo_no_name(xdr, res);
out: out:
return status; return status;
} }