a41d1bc642
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
111 lines
3.3 KiB
C
111 lines
3.3 KiB
C
/*-
|
|
* Copyright (c) 2008 Isilon Inc http://www.isilon.com/
|
|
* Authors: Doug Rabson <dfr@rabson.org>
|
|
* Developed with Red Inc: Alfred Perlstein <alfred@freebsd.org>
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__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 <sys/proc.h>
|
|
|
|
#include <kgssapi/gssapi.h>
|
|
#include <kgssapi/gssapi_impl.h>
|
|
|
|
#include "gssd.h"
|
|
|
|
OM_uint32
|
|
gss_acquire_cred(OM_uint32 *minor_status,
|
|
const gss_name_t desired_name,
|
|
OM_uint32 time_req,
|
|
const gss_OID_set desired_mechs,
|
|
gss_cred_usage_t cred_usage,
|
|
gss_cred_id_t *output_cred_handle,
|
|
gss_OID_set *actual_mechs,
|
|
OM_uint32 *time_rec)
|
|
{
|
|
OM_uint32 major_status;
|
|
struct acquire_cred_res res;
|
|
struct acquire_cred_args args;
|
|
enum clnt_stat stat;
|
|
gss_cred_id_t cred;
|
|
int i;
|
|
CLIENT *cl;
|
|
|
|
*minor_status = 0;
|
|
cl = kgss_gssd_client();
|
|
if (cl == NULL)
|
|
return (GSS_S_FAILURE);
|
|
|
|
args.uid = curthread->td_ucred->cr_uid;
|
|
if (desired_name)
|
|
args.desired_name = desired_name->handle;
|
|
else
|
|
args.desired_name = 0;
|
|
args.time_req = time_req;
|
|
args.desired_mechs = desired_mechs;
|
|
args.cred_usage = cred_usage;
|
|
|
|
bzero(&res, sizeof(res));
|
|
stat = gssd_acquire_cred_1(&args, &res, cl);
|
|
CLNT_RELEASE(cl);
|
|
if (stat != RPC_SUCCESS) {
|
|
*minor_status = stat;
|
|
return (GSS_S_FAILURE);
|
|
}
|
|
|
|
if (res.major_status != GSS_S_COMPLETE) {
|
|
*minor_status = res.minor_status;
|
|
return (res.major_status);
|
|
}
|
|
|
|
cred = malloc(sizeof(struct _gss_cred_id_t), M_GSSAPI, M_WAITOK);
|
|
cred->handle = res.output_cred;
|
|
*output_cred_handle = cred;
|
|
if (actual_mechs) {
|
|
major_status = gss_create_empty_oid_set(minor_status,
|
|
actual_mechs);
|
|
if (major_status)
|
|
return (major_status);
|
|
for (i = 0; i < res.actual_mechs->count; i++) {
|
|
major_status = gss_add_oid_set_member(minor_status,
|
|
&res.actual_mechs->elements[i], actual_mechs);
|
|
if (major_status)
|
|
return (major_status);
|
|
}
|
|
}
|
|
if (time_rec)
|
|
*time_rec = res.time_rec;
|
|
|
|
xdr_free((xdrproc_t) xdr_acquire_cred_res, &res);
|
|
|
|
return (GSS_S_COMPLETE);
|
|
}
|