summaryrefslogtreecommitdiffstats
path: root/sys/kgssapi/gss_canonicalize_name.c
diff options
context:
space:
mode:
authorrmacklem <rmacklem@FreeBSD.org>2012-12-18 00:25:48 +0000
committerrmacklem <rmacklem@FreeBSD.org>2012-12-18 00:25:48 +0000
commita41d1bc642641e36d620138f93f484921d361bce (patch)
tree1a528b7e5e6224c7d6841c880e1617f1b61ec29e /sys/kgssapi/gss_canonicalize_name.c
parent17649eee7d94c9b2e7885ee9119c83cef611a8e4 (diff)
downloadFreeBSD-src-a41d1bc642641e36d620138f93f484921d361bce.zip
FreeBSD-src-a41d1bc642641e36d620138f93f484921d361bce.tar.gz
Piete.Brooks at cl.cam.ac.uk reported via email a crash which was
caused by use of an invalid kgss_gssd_handle during an upcall to the gssd daemon when it has exited. This patch seems to avoid the crashes by holding a reference count on the kgss_gssd_handle until the upcall is done. It also adds a new mutex kgss_gssd_lock used to make manipulation of kgss_gssd_handle SMP safe. Tested by: Illias A. Marinos, Herbert Poeckl Reviewed by: jhb MFC after: 2 weeks
Diffstat (limited to 'sys/kgssapi/gss_canonicalize_name.c')
-rw-r--r--sys/kgssapi/gss_canonicalize_name.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/kgssapi/gss_canonicalize_name.c b/sys/kgssapi/gss_canonicalize_name.c
index bea3dd8..940f64a 100644
--- a/sys/kgssapi/gss_canonicalize_name.c
+++ b/sys/kgssapi/gss_canonicalize_name.c
@@ -31,7 +31,9 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/kernel.h>
#include <sys/kobj.h>
+#include <sys/lock.h>
#include <sys/malloc.h>
+#include <sys/mutex.h>
#include <kgssapi/gssapi.h>
#include <kgssapi/gssapi_impl.h>
@@ -48,15 +50,19 @@ gss_canonicalize_name(OM_uint32 *minor_status,
struct canonicalize_name_args args;
enum clnt_stat stat;
gss_name_t name;
+ CLIENT *cl;
- if (!kgss_gssd_handle)
+ *minor_status = 0;
+ cl = kgss_gssd_client();
+ if (cl == NULL)
return (GSS_S_FAILURE);
args.input_name = input_name->handle;
args.mech_type = mech_type;
bzero(&res, sizeof(res));
- stat = gssd_canonicalize_name_1(&args, &res, kgss_gssd_handle);
+ stat = gssd_canonicalize_name_1(&args, &res, cl);
+ CLNT_RELEASE(cl);
if (stat != RPC_SUCCESS) {
*minor_status = stat;
return (GSS_S_FAILURE);
@@ -69,7 +75,6 @@ gss_canonicalize_name(OM_uint32 *minor_status,
name = malloc(sizeof(struct _gss_name_t), M_GSSAPI, M_WAITOK);
name->handle = res.output_name;
- *minor_status = 0;
*output_name = name;
return (GSS_S_COMPLETE);
OpenPOWER on IntegriCloud