git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
sunrpc
/
auth_gss
/
gss_mech_switch.c
diff --git
a/net/sunrpc/auth_gss/gss_mech_switch.c
b/net/sunrpc/auth_gss/gss_mech_switch.c
index
f8bac6c
..
3db7453
100644
(file)
--- a/
net/sunrpc/auth_gss/gss_mech_switch.c
+++ b/
net/sunrpc/auth_gss/gss_mech_switch.c
@@
-224,7
+224,8
@@
EXPORT_SYMBOL(gss_service_to_auth_domain_name);
void
gss_mech_put(struct gss_api_mech * gm)
{
void
gss_mech_put(struct gss_api_mech * gm)
{
- module_put(gm->gm_owner);
+ if (gm)
+ module_put(gm->gm_owner);
}
EXPORT_SYMBOL(gss_mech_put);
}
EXPORT_SYMBOL(gss_mech_put);
@@
-236,9
+237,8
@@
gss_import_sec_context(const void *input_token, size_t bufsize,
struct gss_api_mech *mech,
struct gss_ctx **ctx_id)
{
struct gss_api_mech *mech,
struct gss_ctx **ctx_id)
{
- if (!(*ctx_id = k
m
alloc(sizeof(**ctx_id), GFP_KERNEL)))
+ if (!(*ctx_id = k
z
alloc(sizeof(**ctx_id), GFP_KERNEL)))
return GSS_S_FAILURE;
return GSS_S_FAILURE;
- memset(*ctx_id, 0, sizeof(**ctx_id));
(*ctx_id)->mech_type = gss_mech_get(mech);
return mech->gm_ops
(*ctx_id)->mech_type = gss_mech_get(mech);
return mech->gm_ops
@@
-307,8
+307,7
@@
gss_delete_sec_context(struct gss_ctx **context_handle)
(*context_handle)->mech_type->gm_ops
->gss_delete_sec_context((*context_handle)
->internal_ctx_id);
(*context_handle)->mech_type->gm_ops
->gss_delete_sec_context((*context_handle)
->internal_ctx_id);
- if ((*context_handle)->mech_type)
- gss_mech_put((*context_handle)->mech_type);
+ gss_mech_put((*context_handle)->mech_type);
kfree(*context_handle);
*context_handle=NULL;
return GSS_S_COMPLETE;
kfree(*context_handle);
*context_handle=NULL;
return GSS_S_COMPLETE;