diff options
| author | Bian Naimeng <biannm@cn.fujitsu.com> | 2010-09-12 19:55:26 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2010-09-12 19:55:26 -0400 |
| commit | 651b2933b22a0c060e6bb940c4104eb447a61f9a (patch) | |
| tree | 8ca4e46718ec63fea52b99c2e9dc32a85029c8dd | |
| parent | ce8477e1176389ed920550f4c925ad4a815b22d5 (diff) | |
| download | linux-3.10-651b2933b22a0c060e6bb940c4104eb447a61f9a.tar.gz linux-3.10-651b2933b22a0c060e6bb940c4104eb447a61f9a.tar.bz2 linux-3.10-651b2933b22a0c060e6bb940c4104eb447a61f9a.zip | |
gss:spkm3 miss returning error to caller when import security context
spkm3 miss returning error to up layer when import security context,
it may be return ok though it has failed to import security context.
Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
| -rw-r--r-- | net/sunrpc/auth_gss/gss_spkm3_mech.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/sunrpc/auth_gss/gss_spkm3_mech.c b/net/sunrpc/auth_gss/gss_spkm3_mech.c index dc3f1f5ed86..adade3d313f 100644 --- a/net/sunrpc/auth_gss/gss_spkm3_mech.c +++ b/net/sunrpc/auth_gss/gss_spkm3_mech.c @@ -100,6 +100,7 @@ gss_import_sec_context_spkm3(const void *p, size_t len, if (version != 1) { dprintk("RPC: unknown spkm3 token format: " "obsolete nfs-utils?\n"); + p = ERR_PTR(-EINVAL); goto out_err_free_ctx; } @@ -135,8 +136,10 @@ gss_import_sec_context_spkm3(const void *p, size_t len, if (IS_ERR(p)) goto out_err_free_intg_alg; - if (p != end) + if (p != end) { + p = ERR_PTR(-EFAULT); goto out_err_free_intg_key; + } ctx_id->internal_ctx_id = ctx; |