From b9a0172bb2c69aefdca2b76dc6411987bfa7f2c7 Mon Sep 17 00:00:00 2001 From: Bian Naimeng Date: Sun, 12 Sep 2010 19:55:26 -0400 Subject: [PATCH] --- yaml --- r: 210669 b: refs/heads/master c: 651b2933b22a0c060e6bb940c4104eb447a61f9a h: refs/heads/master i: 210667: 9fbc43caaa082c76e2db3478d72119cc2c4f2f9c v: v3 --- [refs] | 2 +- trunk/net/sunrpc/auth_gss/gss_spkm3_mech.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e455a24e3a10..b243a9b45532 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce8477e1176389ed920550f4c925ad4a815b22d5 +refs/heads/master: 651b2933b22a0c060e6bb940c4104eb447a61f9a diff --git a/trunk/net/sunrpc/auth_gss/gss_spkm3_mech.c b/trunk/net/sunrpc/auth_gss/gss_spkm3_mech.c index dc3f1f5ed865..adade3d313f2 100644 --- a/trunk/net/sunrpc/auth_gss/gss_spkm3_mech.c +++ b/trunk/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;