git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sii-m15w' into upstream
[pandora-kernel.git]
/
net
/
sunrpc
/
auth_gss
/
gss_krb5_mech.c
diff --git
a/net/sunrpc/auth_gss/gss_krb5_mech.c
b/net/sunrpc/auth_gss/gss_krb5_mech.c
index
129e2bd
..
70e1e53
100644
(file)
--- a/
net/sunrpc/auth_gss/gss_krb5_mech.c
+++ b/
net/sunrpc/auth_gss/gss_krb5_mech.c
@@
-129,9
+129,8
@@
gss_import_sec_context_kerberos(const void *p,
const void *end = (const void *)((const char *)p + len);
struct krb5_ctx *ctx;
const void *end = (const void *)((const char *)p + len);
struct krb5_ctx *ctx;
- if (!(ctx = k
m
alloc(sizeof(*ctx), GFP_KERNEL)))
+ if (!(ctx = k
z
alloc(sizeof(*ctx), GFP_KERNEL)))
goto out_err;
goto out_err;
- memset(ctx, 0, sizeof(*ctx));
p = simple_get_bytes(p, end, &ctx->initiate, sizeof(ctx->initiate));
if (IS_ERR(p))
p = simple_get_bytes(p, end, &ctx->initiate, sizeof(ctx->initiate));
if (IS_ERR(p))
@@
-169,7
+168,7
@@
gss_import_sec_context_kerberos(const void *p,
}
ctx_id->internal_ctx_id = ctx;
}
ctx_id->internal_ctx_id = ctx;
- dprintk("RPC: Succesfully imported new context.\n");
+ dprintk("RPC: Succes
s
fully imported new context.\n");
return 0;
out_err_free_key2:
return 0;
out_err_free_key2: