aboutsummaryrefslogtreecommitdiff
path: root/hurd
diff options
context:
space:
mode:
Diffstat (limited to 'hurd')
-rw-r--r--hurd/hurdauth.c123
-rw-r--r--hurd/hurdsig.c2
2 files changed, 116 insertions, 9 deletions
diff --git a/hurd/hurdauth.c b/hurd/hurdauth.c
index c60b8d8326..64c9db4582 100644
--- a/hurd/hurdauth.c
+++ b/hurd/hurdauth.c
@@ -37,17 +37,124 @@ _S_msg_add_auth (mach_port_t me,
{
error_t err;
auth_t newauth;
+ uid_t *genuids, *gengids, *auxuids, *auxgids;
+ mach_msg_type_number_t ngenuids, ngengids, nauxuids, nauxgids;
+ uid_t *newgenuids, *newgengids, *newauxuids, *newauxgids;
+ mach_msg_type_number_t nnewgenuids, nnewgengids, nnewauxuids, nnewauxgids;
+
+ /* Create a list of ids and store it in NEWLISTP, length NEWLISTLEN.
+ Keep all the ids in EXIST (len NEXIST), adding in those from NEW
+ (len NNEW) which are not already there. */
+ error_t make_list (uid_t **newlistp, mach_msg_type_number_t *newlistlen,
+ uid_t *exist, mach_msg_type_number_t nexist,
+ uid_t *new, mach_msg_type_number_t nnew)
+ {
+ error_t urp;
+ int i, j, k;
+ vm_size_t offset;
+
+ urp = vm_allocate (mach_task_self (), (vm_address_t *) newlistp,
+ nexist + nnew * sizeof (uid_t), 1);
+ if (urp)
+ return urp;
+
+ j = 0;
+ for (i = 0; i < nexist; i++)
+ (*newlistp)[j++] = exist[i];
+
+ for (i = 0; i < nnew; i++)
+ {
+ for (k = 0; k < nexist; k++)
+ if (exist[k] == new[i])
+ break;
+ if (k < nexist)
+ continue;
+
+ (*newlistp)[j++] = new[i];
+ }
+
+ offset = (round_page (nexist + nnew * sizeof (uid_t))
+ - round_page (j * sizeof (uid_t)));
+ if (offset)
+ vm_deallocate (mach_task_self (),
+ (vm_address_t) (*newlistp
+ + (nexist + nnew * sizeof (uid_t))),
+ offset);
+ *newlistlen = j;
+ return 0;
+ }
+
+ /* Find out what ids ADDAUTH refers to */
- if (err = __USEPORT (AUTH,
- __auth_makeauth (port,
- &addauth, MACH_MSG_TYPE_MOVE_SEND, 1,
- NULL, 0,
- NULL, 0,
- NULL, 0,
- NULL, 0,
- &newauth)))
+ genuids = gengids = auxuids = auxgids = 0;
+ ngenuids = ngengids = nauxuids = nauxgids = 0;
+ err = __auth_getids (addauth,
+ &genuids, &ngenuids,
+ &auxuids, &nauxuids,
+ &gengids, &ngengids,
+ &auxgids, &nauxgids);
+ if (err)
return err;
+ /* OR in these ids to what we already have, creating a new list. */
+
+ HURD_CRITICAL_BEGIN;
+ __mutex_lock (&_hurd_id.lock);
+ _hurd_check_ids ();
+
+#define MAKE(genaux,uidgid) \
+ make_list (&new ## genaux ## uidgid ## s, \
+ &nnew ## genaux ## uidgid ## s, \
+ _hurd_id.genaux.uidgid ## s, \
+ _hurd_id.genaux.n ## uidgid ## s, \
+ genaux ## uidgid ## s, \
+ n ## genaux ## uidgid ## s)
+
+ err = MAKE (gen, uid);
+ if (!err)
+ MAKE (aux, uid);
+ if (!err)
+ MAKE (gen, gid);
+ if (!err)
+ MAKE (aux, gid);
+#undef MAKE
+
+ __mutex_unlock (&_hurd_id.lock);
+ HURD_CRITICAL_END;
+
+
+ /* Create the new auth port */
+
+ if (!err)
+ err = __USEPORT (AUTH,
+ __auth_makeauth (port,
+ &addauth, MACH_MSG_TYPE_MOVE_SEND, 1,
+ newgenuids, nnewgenuids,
+ newauxuids, nnewauxuids,
+ newgengids, nnewgengids,
+ newauxgids, nnewauxgids,
+ &newauth));
+
+#define freeup(array, len) \
+ if (array) \
+ vm_deallocate (mach_task_self (), (vm_address_t) array, \
+ len * sizeof (uid_t));
+
+ freeup (genuids, ngenuids);
+ freeup (auxuids, nauxuids);
+ freeup (gengids, ngengids);
+ freeup (auxgids, nauxgids);
+ freeup (newgenuids, nnewgenuids);
+ freeup (newauxuids, nnewauxuids);
+ freeup (newgengids, nnewgengids);
+ freeup (newauxgids, nnewauxgids);
+#undef freeup
+
+ if (err)
+ return err;
+
+ /* And install it. */
+
err = __setauth (newauth);
__mach_port_deallocate (__mach_task_self (), newauth);
if (err)
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 592dc12e66..f50daa2f8f 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -1194,7 +1194,7 @@ _hurdsig_init (void)
err = __thread_create (__mach_task_self (), &_hurd_msgport_thread);
assert_perror (err);
- stacksize = __vm_page_size * 4; /* Small stack for signal thread. */
+ stacksize = __vm_page_size * 8; /* Small stack for signal thread. */
err = __mach_setup_thread (__mach_task_self (), _hurd_msgport_thread,
_hurd_msgport_receive,
(vm_address_t *) &__hurd_sigthread_stack_base,