* gss security init/fini helper *
**********************************************/
-#define SECINIT_RPC_TIMEOUT (10)
-#define SECFINI_RPC_TIMEOUT (10)
+#define SECINIT_RPC_TIMEOUT (30)
+#define SECFINI_RPC_TIMEOUT (30)
static int secinit_compose_request(struct obd_import *imp,
char *buf, int bufsize,
+ int lustre_srv,
uid_t uid, gid_t gid,
long token_size,
char __user *token)
struct ptlrpcs_wire_hdr *hdr;
struct lustre_msg *lmsg;
struct mds_req_sec_desc *secdesc;
- __u32 size = sizeof(*secdesc);
+ int size = sizeof(*secdesc);
__u32 lmsg_size, *p;
int rc;
hdr->flavor = cpu_to_le32(PTLRPC_SEC_GSS);
hdr->sectype = cpu_to_le32(PTLRPC_SEC_TYPE_NONE);
hdr->msg_len = cpu_to_le32(lmsg_size);
- hdr->sec_len = cpu_to_le32(7 * 4 + token_size);
+ hdr->sec_len = cpu_to_le32(8 * 4 + token_size);
/* lustre message & secdesc */
lmsg = buf_to_lustre_msg(buf);
*p++ = cpu_to_le32(PTLRPC_GSS_SVC_NONE); /* service */
*p++ = cpu_to_le32(0); /* context handle */
+ /* plus lustre svc type */
+ *p++ = cpu_to_le32(lustre_srv);
+
/* now the token part */
*p++ = cpu_to_le32((__u32) token_size);
LASSERT(((char *)p - buf) + token_size <= bufsize);
struct lgssd_ioctl_param {
int version; /* in */
char *uuid; /* in */
+ int lustre_svc; /* in */
uid_t uid; /* in */
gid_t gid; /* in */
long send_token_size;/* in */
static int gss_send_secinit_rpc(__user char *buffer, unsigned long count)
{
struct obd_import *imp;
+ struct ptlrpc_request *request = NULL;
struct lgssd_ioctl_param param;
const int reqbuf_size = 1024;
const int repbuf_size = 1024;
int rc, reqlen, replen;
if (count != sizeof(param)) {
- CERROR("partial write\n");
+ CERROR("ioctl size %lu, expect %d, please check lgssd version\n",
+ count, sizeof(param));
RETURN(-EINVAL);
}
- if (copy_from_user(¶m, buffer, sizeof(param)))
+ if (copy_from_user(¶m, buffer, sizeof(param))) {
+ CERROR("failed copy data from lgssd\n");
RETURN(-EFAULT);
+ }
if (param.version != GSSD_INTERFACE_VERSION) {
CERROR("gssd interface version %d (expect %d)\n",
CERROR("no such obd %s\n", obdname);
RETURN(-EINVAL);
}
- if (strcmp(obd->obd_type->typ_name, "mdc") &&
- strcmp(obd->obd_type->typ_name, "osc")) {
- CERROR("%s not a mdc/osc device\n", obdname);
- RETURN(-EINVAL);
- }
imp = class_import_get(obd->u.cli.cl_import);
if (!reqbuf || !repbuf) {
CERROR("Can't alloc buffer: %p/%p\n", reqbuf, repbuf);
- GOTO(out_free, rc = -ENOMEM);
+ param.status = -ENOMEM;
+ goto out_copy;
}
/* get token */
reqlen = secinit_compose_request(imp, reqbuf, reqbuf_size,
+ param.lustre_svc,
param.uid, param.gid,
param.send_token_size,
param.send_token);
- if (reqlen < 0)
- GOTO(out_free, rc = reqlen);
+ if (reqlen < 0) {
+ param.status = reqlen;
+ goto out_copy;
+ }
- replen = repbuf_size;
- rc = ptlrpc_do_rawrpc(imp, reqbuf, reqlen,
- repbuf, &replen, SECINIT_RPC_TIMEOUT);
- if (rc)
- GOTO(out_free, rc);
+ request = ptl_do_rawrpc(imp, reqbuf, reqbuf_size, reqlen,
+ repbuf, repbuf_size, &replen,
+ SECINIT_RPC_TIMEOUT, &rc);
+ if (request == NULL || rc) {
+ param.status = rc;
+ goto out_copy;
+ }
if (replen > param.reply_buf_size) {
CERROR("output buffer size %ld too small, need %d\n",
param.reply_buf_size, replen);
- GOTO(out_free, rc = -EINVAL);
+ param.status = -EINVAL;
+ goto out_copy;
}
lsize = secinit_parse_reply(repbuf, replen,
param.reply_buf, param.reply_buf_size);
- if (lsize < 0)
- GOTO(out_free, rc = (int)lsize);
+ if (lsize < 0) {
+ param.status = (int) lsize;
+ goto out_copy;
+ }
param.status = 0;
param.reply_length = lsize;
+out_copy:
if (copy_to_user(buffer, ¶m, sizeof(param)))
rc = -EFAULT;
else
rc = 0;
-out_free:
- class_import_put(imp);
- if (repbuf)
- OBD_FREE(repbuf, repbuf_size);
- if (reqbuf)
- OBD_FREE(reqbuf, reqbuf_size);
- RETURN(rc);
-}
-
-static int gss_send_secfini_rpc(struct obd_import *imp,
- char *reqbuf, int reqlen)
-{
- const int repbuf_size = 1024;
- char *repbuf;
- int replen = repbuf_size;
- int rc;
- OBD_ALLOC(repbuf, repbuf_size);
- if (!repbuf) {
- CERROR("Out of memory\n");
- return -ENOMEM;
+ class_import_put(imp);
+ if (request == NULL) {
+ if (repbuf)
+ OBD_FREE(repbuf, repbuf_size);
+ if (reqbuf)
+ OBD_FREE(reqbuf, reqbuf_size);
+ } else {
+ rawrpc_req_finished(request);
}
-
- rc = ptlrpc_do_rawrpc(imp, reqbuf, reqlen, repbuf, &replen,
- SECFINI_RPC_TIMEOUT);
-
- OBD_FREE(repbuf, repbuf_size);
- return rc;
+ RETURN(rc);
}
/**********************************************
return;
}
LASSERT(list_empty(&gmsg->gum_list));
+ LASSERT(list_empty(&gmsg->gum_base.list));
OBD_FREE(gmsg, sizeof(*gmsg));
EXIT;
}
EXIT;
return;
}
- /* FIXME should not do this. when we in upper upcall queue,
- * downcall will call unhash_msg, thus later put_msg might
- * free msg buffer while it's not dequeued XXX */
- list_del_init(&gmsg->gum_base.list);
- /* FIXME */
list_del_init(&gmsg->gum_list);
wake_up(&gmsg->gum_waitq);
#endif /* __KERNEL__ */
/********************************************
- * gss cred manupulation helpers *
+ * gss cred manipulation helpers *
********************************************/
+#if 0
static
int gss_cred_is_uptodate_ctx(struct ptlrpc_cred *cred)
{
int res = 0;
read_lock(&gss_ctx_lock);
- if ((cred->pc_flags & PTLRPC_CRED_UPTODATE) && gcred->gc_ctx)
+ if (((cred->pc_flags & PTLRPC_CRED_FLAGS_MASK) ==
+ PTLRPC_CRED_UPTODATE) &&
+ gcred->gc_ctx)
res = 1;
read_unlock(&gss_ctx_lock);
return res;
}
+#endif
static inline
struct gss_cl_ctx * gss_get_ctx(struct gss_cl_ctx *ctx)
if (old)
gss_put_ctx(old);
- CWARN("client refreshed gss cred %p(uid %u)\n", cred, cred->pc_uid);
+ CDEBUG(D_SEC, "client refreshed gss cred %p(uid %u)\n",
+ cred, cred->pc_uid);
EXIT;
}
struct gss_cl_ctx **gc,
struct gss_upcall_msg_data *gmd, int *gss_err)
{
- char *p = buf->data;
- __u32 len = buf->len;
+ char *p = (char *)buf->data;
struct gss_cl_ctx *ctx;
- rawobj_t tmp_buf;
+ __u32 len = buf->len;
unsigned int timeout;
- int err = -EIO;
+ rawobj_t tmp_buf;
+ int err = -EPERM;
ENTRY;
*gc = NULL;
+ *gss_err = 0;
OBD_ALLOC(ctx, sizeof(*ctx));
if (!ctx)
atomic_set(&ctx->gc_refcount,1);
if (simple_get_bytes(&p, &len, &gmd->gum_uid, sizeof(gmd->gum_uid)))
- GOTO(err_free_ctx, err);
+ goto err_free_ctx;
if (simple_get_bytes(&p, &len, &gmd->gum_svc, sizeof(gmd->gum_svc)))
- GOTO(err_free_ctx, err);
+ goto err_free_ctx;
if (simple_get_bytes(&p, &len, &gmd->gum_nal, sizeof(gmd->gum_nal)))
- GOTO(err_free_ctx, err);
+ goto err_free_ctx;
if (simple_get_bytes(&p, &len, &gmd->gum_netid, sizeof(gmd->gum_netid)))
- GOTO(err_free_ctx, err);
+ goto err_free_ctx;
if (simple_get_bytes(&p, &len, &gmd->gum_nid, sizeof(gmd->gum_nid)))
- GOTO(err_free_ctx, err);
+ goto err_free_ctx;
/* FIXME: discarded timeout for now */
if (simple_get_bytes(&p, &len, &timeout, sizeof(timeout)))
- GOTO(err_free_ctx, err);
- *gss_err = 0;
+ goto err_free_ctx;
if (simple_get_bytes(&p, &len, &ctx->gc_win, sizeof(ctx->gc_win)))
- GOTO(err_free_ctx, err);
- /* gssd signals an error by passing ctx->gc_win = 0: */
+ goto err_free_ctx;
+
+ /* lgssd signals an error by passing ctx->gc_win = 0: */
if (!ctx->gc_win) {
- /* in which case the next int is an error code: */
- if (simple_get_bytes(&p, &len, gss_err, sizeof(*gss_err)))
- GOTO(err_free_ctx, err);
- if (*gss_err == 0) {
- CERROR("error downcall pass no gss error\n");
- GOTO(err_free_ctx, err);
+ /* in which case the next 2 int are:
+ * - rpc error
+ * - gss error
+ */
+ if (simple_get_bytes(&p, &len, &err, sizeof(err))) {
+ err = -EPERM;
+ goto err_free_ctx;
+ }
+ if (simple_get_bytes(&p, &len, gss_err, sizeof(*gss_err))) {
+ err = -EPERM;
+ goto err_free_ctx;
}
- GOTO(err_free_ctx, err = 0);
+ if (err == 0 && *gss_err == 0) {
+ CERROR("no error passed from downcall\n");
+ err = -EPERM;
+ }
+ goto err_free_ctx;
}
+
if (rawobj_extract_local(&tmp_buf, (__u32 **) ((void *)&p), &len))
- GOTO(err_free_ctx, err);
+ goto err_free_ctx;
if (rawobj_dup(&ctx->gc_wire_ctx, &tmp_buf)) {
- GOTO(err_free_ctx, err = -ENOMEM);
+ err = -ENOMEM;
+ goto err_free_ctx;
}
if (rawobj_extract_local(&tmp_buf, (__u32 **) ((void *)&p), &len))
- GOTO(err_free_wire_ctx, err);
+ goto err_free_wire_ctx;
if (len) {
CERROR("unexpected trailing %u bytes\n", len);
- GOTO(err_free_wire_ctx, err);
+ goto err_free_wire_ctx;
}
if (kgss_import_sec_context(&tmp_buf, gm, &ctx->gc_gss_ctx))
- GOTO(err_free_wire_ctx, err);
+ goto err_free_wire_ctx;
*gc = ctx;
RETURN(0);
* cred APIs *
***************************************/
#ifdef __KERNEL__
-#define CRED_REFRESH_UPCALL_TIMEOUT (20)
+#define CRED_REFRESH_UPCALL_TIMEOUT (50)
static int gss_cred_refresh(struct ptlrpc_cred *cred)
{
struct obd_import *import;
int res;
ENTRY;
- if (ptlrpcs_cred_is_uptodate(cred))
+ /* any flags means it has been handled, do nothing */
+ if (cred->pc_flags & PTLRPC_CRED_FLAGS_MASK)
RETURN(0);
LASSERT(cred->pc_sec);
obdtype = import->imp_obd->obd_type->typ_name;
if (!strcmp(obdtype, "mdc"))
- gmd.gum_svc = 0;
+ gmd.gum_svc = LUSTRE_GSS_SVC_MDS;
else if (!strcmp(obdtype, "osc"))
- gmd.gum_svc = 1;
+ gmd.gum_svc = LUSTRE_GSS_SVC_OSS;
else {
CERROR("gss on %s?\n", obdtype);
RETURN(-EINVAL);
gss_new = NULL;
res = 0;
- CWARN("Initiate gss context %p(%u@%s)\n",
+ CDEBUG(D_SEC, "Initiate gss context %p(%u@%s)\n",
container_of(cred, struct gss_cred, gc_base),
uid, import->imp_target_uuid.uuid);
spin_lock(&gsec->gs_lock);
gss_msg = gss_find_upcall(gsec, obdname, &gmd);
if (gss_msg) {
- spin_unlock(&gsec->gs_lock);
+ if (gss_new) {
+ OBD_FREE(gss_new, sizeof(*gss_new));
+ gss_new = NULL;
+ }
GOTO(waiting, res);
}
+
if (!gss_new) {
spin_unlock(&gsec->gs_lock);
OBD_ALLOC(gss_new, sizeof(*gss_new));
- if (!gss_new) {
- CERROR("fail to alloc memory\n");
+ if (!gss_new)
RETURN(-ENOMEM);
- }
goto again;
}
/* so far we'v created gss_new */
gss_init_upcall_msg(gss_new, gsec, obdname, &gmd);
- if (gss_cred_is_uptodate_ctx(cred)) {
- /* someone else had done it for us, simply cancel
- * our own upcall */
- CDEBUG(D_SEC, "cred("LPU64"/%u) has been refreshed by someone "
- "else, simply drop our request\n",
- cred->pc_pag, cred->pc_uid);
+ /* we'v created upcall msg, nobody else should touch the
+ * flag of this cred, unless be set as dead/expire by
+ * administrator via lctl etc.
+ */
+ if (cred->pc_flags & PTLRPC_CRED_FLAGS_MASK) {
+ CWARN("cred %p("LPU64"/%u) was set flags %x unexpectedly\n",
+ cred, cred->pc_pag, cred->pc_uid, cred->pc_flags);
+ cred->pc_flags |= PTLRPC_CRED_DEAD | PTLRPC_CRED_ERROR;
gss_unhash_msg_nolock(gss_new);
spin_unlock(&gsec->gs_lock);
gss_release_msg(gss_new);
CERROR("rpc_queue_upcall failed: %d\n", res);
gss_unhash_msg(gss_new);
gss_release_msg(gss_new);
+ cred->pc_flags |= PTLRPC_CRED_DEAD | PTLRPC_CRED_ERROR;
RETURN(res);
}
gss_msg = gss_new;
+ spin_lock(&gsec->gs_lock);
waiting:
+ /* upcall might finish quickly */
+ if (list_empty(&gss_msg->gum_list)) {
+ spin_unlock(&gsec->gs_lock);
+ res = 0;
+ goto out;
+ }
+
init_waitqueue_entry(&wait, current);
- spin_lock(&gsec->gs_lock);
- add_wait_queue(&gss_msg->gum_waitq, &wait);
set_current_state(TASK_INTERRUPTIBLE);
+ add_wait_queue(&gss_msg->gum_waitq, &wait);
spin_unlock(&gsec->gs_lock);
- res = schedule_timeout(CRED_REFRESH_UPCALL_TIMEOUT * HZ);
+ if (gss_new)
+ res = schedule_timeout(CRED_REFRESH_UPCALL_TIMEOUT * HZ);
+ else {
+ schedule();
+ res = 0;
+ }
remove_wait_queue(&gss_msg->gum_waitq, &wait);
+
+ /* - the one who refresh the cred for us should also be responsible
+ * to set the status of cred, we can simply return.
+ * - if cred flags has been set, we also don't need to do that again,
+ * no matter signal pending or timeout etc.
+ */
+ if (!gss_new || cred->pc_flags & PTLRPC_CRED_FLAGS_MASK)
+ goto out;
+
if (signal_pending(current)) {
- CERROR("interrupted gss upcall: cred %p\n", cred);
+ CERROR("cred %p: interrupted upcall\n", cred);
+ cred->pc_flags |= PTLRPC_CRED_DEAD | PTLRPC_CRED_ERROR;
res = -EINTR;
} else if (res == 0) {
- CERROR("gss upcall timeout: cred %p\n", cred);
+ CERROR("cred %p: upcall timedout\n", cred);
+ cred->pc_flags |= PTLRPC_CRED_DEAD;
res = -ETIMEDOUT;
} else
res = 0;
+out:
gss_release_msg(gss_msg);
+
RETURN(res);
}
#else /* !__KERNEL__ */
LASSERT(mech);
rc = gss_parse_init_downcall(mech, &obj, &ctx, &vcred, &dest_ip,
&gss_err);
- if (rc) {
- CERROR("parse init downcall error %d\n", rc);
- goto err_out;
- }
-
- if (gss_err) {
- CERROR("cred fresh got gss error %x\n", gss_err);
- rc = -EINVAL;
+ if (rc || gss_err) {
+ CERROR("parse init downcall: rpc %d, gss 0x%x\n", rc, gss_err);
+ if (rc != -ERESTART || gss_err != 0)
+ cred->pc_flags |= PTLRPC_CRED_ERROR;
+ if (rc == 0)
+ rc = -EPERM;
goto err_out;
}
#endif
static int gss_cred_match(struct ptlrpc_cred *cred,
- struct ptlrpc_request *req,
struct vfs_cred *vcred)
{
RETURN(cred->pc_pag == vcred->vc_pag);
vlen -= 4;
mic.len = vlen;
- mic.data = (char *) vp;
+ mic.data = (unsigned char *)vp;
CDEBUG(D_SEC, "reqbuf at %p, lmsg at %p, len %d, mic at %p, len %d\n",
req->rq_reqbuf, lmsg.data, lmsg.len, mic.data, mic.len);
CERROR("vlen %d, mic.len %d\n", vlen, mic.len);
RETURN(-EINVAL);
}
- mic.data = (char *) vp;
+ mic.data = (unsigned char *)vp;
gcred = container_of(cred, struct gss_cred, gc_base);
ctx = gss_cred_get_ctx(cred);
else
CERROR("replace dead cred failed %d\n", rc);
} else {
- CERROR("Unrecognized gss error (%x/%x)\n",
- major, minor);
+ CERROR("req %p: unrecognized gss error (%x/%x)\n",
+ req, major, minor);
rc = -EACCES;
}
break;
struct ptlrpc_request req;
struct obd_import *imp;
__u32 *vp, lmsg_size;
+ struct ptlrpc_request *raw_req = NULL;
+ const int repbuf_len = 256;
+ char *repbuf;
+ int replen, rc;
ENTRY;
/* cred's refcount is 0, steal one */
LASSERT(imp);
if (!(cred->pc_flags & PTLRPC_CRED_UPTODATE)) {
- CWARN("Destroy a dead gss cred %p(%u@%s), don't send rpc\n",
+ CDEBUG(D_SEC, "Destroy a dead gss cred %p(%u@%s)\n",
gcred, cred->pc_uid, imp->imp_target_uuid.uuid);
atomic_dec(&cred->pc_refcount);
EXIT;
return;
}
- CWARN("client destroy gss cred %p(%u@%s)\n",
+ CDEBUG(D_SEC, "client destroy gss cred %p(%u@%s)\n",
gcred, cred->pc_uid, imp->imp_target_uuid.uuid);
lmsg_size = lustre_msg_size(0, NULL);
}
atomic_dec(&cred->pc_refcount);
- /* send out */
- gss_send_secfini_rpc(imp, req.rq_reqbuf, req.rq_reqdata_len);
+ OBD_ALLOC(repbuf, repbuf_len);
+ if (!repbuf)
+ goto exit;
+
+ raw_req = ptl_do_rawrpc(imp, req.rq_reqbuf, req.rq_reqbuf_len,
+ req.rq_reqdata_len, repbuf, repbuf_len, &replen,
+ SECFINI_RPC_TIMEOUT, &rc);
+ if (!raw_req)
+ OBD_FREE(repbuf, repbuf_len);
+
exit:
- OBD_FREE(req.rq_reqbuf, req.rq_reqbuf_len);
+ if (raw_req == NULL)
+ OBD_FREE(req.rq_reqbuf, req.rq_reqbuf_len);
+ else
+ rawrpc_req_finished(raw_req);
EXIT;
}
if (left)
GOTO(err_free, err = -EFAULT);
- obj.data = buf;
+ obj.data = (unsigned char *)buf;
obj.len = mlen;
LASSERT(rpci->private);
cred = ptlrpcs_cred_lookup(sec, &vcred);
if (!cred) {
CWARN("didn't find cred for uid %u\n", vcred.vc_uid);
- GOTO(err, err);
+ GOTO(err, err = -EINVAL);
}
+
if (err || gss_err) {
- CERROR("got err %d, gss err %d, set cred %p dead\n",
- err, gss_err, cred);
cred->pc_flags |= PTLRPC_CRED_DEAD;
+ if (err != -ERESTART || gss_err != 0)
+ cred->pc_flags |= PTLRPC_CRED_ERROR;
+ CERROR("cred %p: rpc err %d, gss err 0x%x, fatal %d\n",
+ cred, err, gss_err,
+ ((cred->pc_flags & PTLRPC_CRED_ERROR) != 0));
} else {
CDEBUG(D_SEC, "get initial ctx:\n");
gss_cred_set_ctx(cred, ctx);
static
struct ptlrpc_cred * gss_create_cred(struct ptlrpc_sec *sec,
- struct ptlrpc_request *req,
struct vfs_cred *vcred)
{
struct gss_cred *gcred;
atomic_set(&cred->pc_refcount, 0);
cred->pc_sec = sec;
cred->pc_ops = &gss_credops;
- cred->pc_req = req;
cred->pc_expire = get_seconds() + GSS_CRED_EXPIRE;
cred->pc_flags = 0;
cred->pc_pag = vcred->vc_pag;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff