 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_futex.c,v 1.18.4.1 2009/02/26 20:40:52 snj Exp $ */
+/*	$NetBSD: linux_futex.c,v 1.18.4.2 2009/03/16 01:20:37 snj Exp $ */
 /*-
  * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
+ *
  * 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -22,27 +22,27 @@
  * 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>
-__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.18.4.1 2009/02/26 20:40:52 snj Exp $");
+__KERNEL_RCSID(1, "$NetBSD: linux_futex.c,v 1.18.4.2 2009/03/16 01:20:37 snj Exp $");
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/lwp.h>
 #include <sys/queue.h>
 #include <sys/condvar.h>
 #include <sys/mutex.h>
 #include <sys/once.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/atomic.h>
 @@ -488,62 +488,63 @@ futex_atomic_op(lwp_t *l, int encoded_op
 		return (oldval > cmparg);
 	default:
 		return -ENOSYS;
+	}
+}
 int
 linux_sys_set_robust_list(struct lwp *l,
     const struct linux_sys_set_robust_list_args *uap, register_t *retval)
+{
 	struct proc *p = l->l_proc;
 	struct linux_emuldata *led = p->p_emuldata;
 	if (SCARG(uap, len) != sizeof(*(led->robust_futexes)))
 		return EINVAL;
 	led->robust_futexes = SCARG(uap, head);
 	*retval = 0;
 	return 0;
+}
 int
 linux_sys_get_robust_list(struct lwp *l,
     const struct linux_sys_get_robust_list_args *uap, register_t *retval)
+{
 	struct linux_emuldata *led;
-	struct linux_robust_list_head *head;
+	struct linux_robust_list_head **head;
-	size_t len = sizeof(struct linux_robust_list_head);
+	size_t len = sizeof(*led->robust_futexes);
 	int error = 0;
 	if (!SCARG(uap, pid)) {
 		led = l->l_proc->p_emuldata;
-		head = led->robust_futexes;
+		head = &led->robust_futexes;
 	} else {
 		struct proc *p;
 		mutex_enter(proc_lock);
 		if ((p = p_find(SCARG(uap, pid), PFIND_LOCKED)) == NULL ||
 		    p->p_emul != &emul_linux) {
 			mutex_exit(proc_lock);
 			return ESRCH;
+		}
 		led = p->p_emuldata;
-		head = led->robust_futexes;
+		head = &led->robust_futexes;
 		mutex_exit(proc_lock);
+	}
-	error = copyout(&len, SCARG(uap, len), sizeof(size_t));
+	error = copyout(&len, SCARG(uap, len), sizeof(len));
 	if (error)
 		return error;
-	return copyout(head, SCARG(uap, head),
+	return copyout(head, SCARG(uap, head), sizeof(*head));
 	    sizeof(struct linux_robust_list_head));
+}
 static int
 handle_futex_death(void *uaddr, pid_t pid, int pi)
+{
 	int uval, nval, mval;
 	struct futex *f;
 retry:
 	if (copyin(uaddr, &uval, 4))
 		return EFAULT;
 	if ((uval & FUTEX_TID_MASK) == pid) {
 @@ -574,49 +575,50 @@ fetch_robust_entry(struct linux_robust_l
 	if (copyin((const void *)head, &uentry, sizeof(unsigned long)))
 		return EFAULT;
 	*entry = (void *)(uentry & ~1UL);
 	*pi = uentry & 1;
 	return 0;
+}
 /* This walks the list of robust futexes, releasing them. */
 void
 release_futexes(struct proc *p)
+{
-	struct linux_robust_list_head *head = NULL;
+	struct linux_robust_list_head head;
 	struct linux_robust_list *entry, *next_entry, *pending;
 	unsigned int limit = 2048, pi, next_pi, pip;
 	struct linux_emuldata *led;
 	unsigned long futex_offset;
 	int rc;
 	led = p->p_emuldata;
-	head = led->robust_futexes;
+	if (led->robust_futexes == NULL)
 		return;
-	if (head == NULL)
+	if (copyin(led->robust_futexes, &head, sizeof(head)))
 		return;
-	if (fetch_robust_entry(&entry, &head->list.next, &pi))
+	if (fetch_robust_entry(&entry, &head.list.next, &pi))
 		return;
-	if (copyin(&head->futex_offset, &futex_offset, sizeof(unsigned long)))
+	if (copyin(&head.futex_offset, &futex_offset, sizeof(unsigned long)))
 		return;
-	if (fetch_robust_entry(&pending, &head->pending_list, &pip))
+	if (fetch_robust_entry(&pending, &head.pending_list, &pip))
 		return;
-	while (entry != &head->list) {
+	while (entry != &head.list) {
 		rc = fetch_robust_entry(&next_entry, &entry->next, &next_pi);
 		if (entry != pending)
 			if (handle_futex_death((char *)entry + futex_offset,
 			    p->p_pid, pi))
 				return;
 		if (rc)
 			return;
 		entry = next_entry;
 		pi = next_pi;