Browse Source

SUNRPC: Fix up an error return value in gss_import_sec_context_kerberos()

If the context allocation fails, the function currently returns a random
error code, since the variable 'p' still points to a valid memory location.

Ensure that it returns ENOMEM...

Cc: stable@kernel.org
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Trond Myklebust 15 years ago
parent
commit
14ace024b1
1 changed files with 3 additions and 1 deletions
  1. 3 1
      net/sunrpc/auth_gss/gss_krb5_mech.c

+ 3 - 1
net/sunrpc/auth_gss/gss_krb5_mech.c

@@ -131,8 +131,10 @@ gss_import_sec_context_kerberos(const void *p,
 	struct	krb5_ctx *ctx;
 	struct	krb5_ctx *ctx;
 	int tmp;
 	int tmp;
 
 
-	if (!(ctx = kzalloc(sizeof(*ctx), GFP_NOFS)))
+	if (!(ctx = kzalloc(sizeof(*ctx), GFP_NOFS))) {
+		p = ERR_PTR(-ENOMEM);
 		goto out_err;
 		goto out_err;
+	}
 
 
 	p = simple_get_bytes(p, end, &ctx->initiate, sizeof(ctx->initiate));
 	p = simple_get_bytes(p, end, &ctx->initiate, sizeof(ctx->initiate));
 	if (IS_ERR(p))
 	if (IS_ERR(p))