oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

IPC: do not use alloca() in Solaris doors backend

Browse Source
This commit is contained in:
Luke Howard
2018-05-13 17:50:30 +10:00
parent 73fde33757
commit defde8be68
1 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/ipc/server.c
View File

@@ -1138,12 +1138,15 @@ heim_sipc_service_unix(const char *service,
#ifdef HAVE_DOOR_CREATE #ifdef HAVE_DOOR_CREATE
#include <door.h> #include <door.h>
#include <alloca.h>
#ifdef HAVE_SYS_MMAN_H #ifdef HAVE_SYS_MMAN_H
#include <sys/mman.h> #include <sys/mman.h>
#endif #endif
#include "heim_threads.h"
static HEIMDAL_thread_key door_key;
struct door_call { struct door_call {
heim_idata in; heim_idata in;
door_desc_t *dp; door_desc_t *dp;
@@ -1163,26 +1166,61 @@ door_release(heim_sipc ctx)
return 0; return 0;
} }
static void
door_reply_destroy(void *data)
{
free(data);
}
static void
door_key_create(void *key)
{
int ret;
HEIMDAL_key_create((HEIMDAL_thread_key *)key, door_reply_destroy, ret);
}
static void static void
door_complete(heim_sipc_call ctx, int returnvalue, heim_idata *reply) door_complete(heim_sipc_call ctx, int returnvalue, heim_idata *reply)
{ {
static heim_base_once_t once = HEIM_BASE_ONCE_INIT;
struct door_call *cs = (struct door_call *)ctx; struct door_call *cs = (struct door_call *)ctx;
size_t rlen = offsetof(struct door_reply, data); size_t rlen;
struct door_reply *r; struct door_reply *r = NULL;
union {
struct door_reply reply;
char buffer[offsetof(struct door_reply, data) + BUFSIZ];
} replyBuf;
int ret;
heim_base_once_f(&once, &door_key, door_key_create);
/* free previously saved reply, if any */
free(HEIMDAL_getspecific(door_key));
rlen = offsetof(struct door_reply, data);
if (returnvalue == 0) if (returnvalue == 0)
rlen += reply->length; rlen += reply->length;
r = alloca(rlen); /* long replies (> BUFSIZ) are allocated from the heap */
r->returnvalue = returnvalue; if (rlen > BUFSIZ) {
r = malloc(rlen);
if (r == NULL)
returnvalue = EAGAIN;
}
if (returnvalue == 0) { if (r == NULL)
r = &replyBuf.reply;
r->returnvalue = returnvalue;
if (r->returnvalue == 0) {
r->length = reply->length; r->length = reply->length;
memcpy(r->data, reply->data, reply->length); memcpy(r->data, reply->data, reply->length);
} }
/* door_return() doesn't return; don't leak cred */ /* door_return() doesn't return; don't leak cred */
heim_ipc_free_cred(cs->cred); heim_ipc_free_cred(cs->cred);
HEIMDAL_setspecific(door_key, r == &replyBuf.reply ? NULL : r, ret);
door_return((char *)r, rlen, NULL, 0); door_return((char *)r, rlen, NULL, 0);
} }