 @@ -1,14 +1,14 @@
-/* $NetBSD: linux32_ipccall.c,v 1.3 2009/02/18 14:40:14 njoly Exp $ */
+/* $NetBSD: linux32_ipccall.c,v 1.4 2009/04/27 13:24:18 njoly Exp $ */
 /*
  * Copyright (c) 2008 Nicolas Joly
  * 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.
 @@ -17,27 +17,27 @@
  * ``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 FOUNDATION 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(0, "$NetBSD: linux32_ipccall.c,v 1.3 2009/02/18 14:40:14 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_ipccall.c,v 1.4 2009/04/27 13:24:18 njoly Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_sysv.h"
 #endif
 #include <sys/param.h>
 #include <sys/vnode.h>
 #include <sys/sem.h>
 #include <sys/shm.h>
 #include <sys/syscallargs.h>
 #include <compat/netbsd32/netbsd32.h>
 @@ -243,59 +243,59 @@ linux32_semget(struct lwp *l, const stru
 	struct sys_semget_args ua;
 	SCARG(&ua, key) = SCARG(uap, a1);
 	SCARG(&ua, nsems) = SCARG(uap, a2);
 	SCARG(&ua, semflg) = SCARG(uap, a3);
 	return sys_semget(l, &ua, retval);
+}
 static int
 linux32_semctl(struct lwp *l, const struct linux32_sys_ipc_args *uap,
     register_t *retval)
+{
-	int cmd, error;
+	int lcmd, cmd, error;
 	struct semid_ds bs;
 	struct linux32_semid_ds ls;
 	struct linux32_semid64_ds ls64;
 	union linux32_semun lsem;
 	union __semun bsem;
 	void *buf = NULL;
 	if ((error = copyin(SCARG_P32(uap, ptr), &lsem, sizeof lsem)))
 		return error;
-	switch (SCARG(uap, a3)) {
+	lcmd = SCARG(uap, a3);
 	switch (lcmd & ~LINUX32_IPC_64) {
 	case LINUX32_IPC_RMID:
 		cmd = IPC_RMID;
 		break;
 	case LINUX32_IPC_STAT:
 	case LINUX32_IPC_STAT|LINUX32_IPC_64:
 		cmd = IPC_STAT;
 		buf = &bs;
 		break;
 	case LINUX32_IPC_SET:
-		error = copyin(NETBSD32PTR64(lsem.l_buf), &ls, sizeof ls);
+		if (lcmd & LINUX32_IPC_64) {
-		if (error)
+			error = copyin(NETBSD32PTR64(lsem.l_buf), &ls64,
-			return error;
+			    sizeof ls64);
-		linux32_to_bsd_semid_ds(&ls, &bs);
+			linux32_to_bsd_semid64_ds(&ls64, &bs);
-		cmd = IPC_SET;
+		} else {
-		buf = &bs;
+			error = copyin(NETBSD32PTR64(lsem.l_buf), &ls,
-		break;
+			    sizeof ls);
-	case LINUX32_IPC_SET|LINUX32_IPC_64:
+			linux32_to_bsd_semid_ds(&ls, &bs);
 		error = copyin(NETBSD32PTR64(lsem.l_buf), &ls64, sizeof ls64);
 		if (error)
 			return error;
 		linux32_to_bsd_semid64_ds(&ls64, &bs);
 		cmd = IPC_SET;
 		buf = &bs;
 		break;
 	case LINUX32_GETVAL:
 		cmd = GETVAL;
 		break;
 	case LINUX32_SETVAL:
 		cmd = SETVAL;
 		bsem.val = lsem.l_val;
 		buf = &bsem;
 		break;
 	case LINUX32_GETPID:
 		cmd = GETPID;
 @@ -314,27 +314,27 @@ linux32_semctl(struct lwp *l, const stru
 	case LINUX32_SETALL:
 		cmd = SETALL;
 		bsem.array = NETBSD32PTR64(lsem.l_array);
 		buf = &bsem;
 		break;
 	default:
 		return EINVAL;
+	}
 	error = semctl1(l, SCARG(uap, a1), SCARG(uap, a2), cmd, buf, retval);
 	if (error)
 		return error;
-	switch (SCARG(uap, a3)) {
+	switch (lcmd) {
 	case LINUX32_IPC_STAT:
 		bsd_to_linux32_semid_ds(&bs, &ls);
 		error = copyout(&ls, NETBSD32PTR64(lsem.l_buf), sizeof ls);
 		break;
 	case LINUX32_IPC_STAT|LINUX32_IPC_64:
 		bsd_to_linux32_semid64_ds(&bs, &ls64);
 		error = copyout(&ls64, NETBSD32PTR64(lsem.l_buf), sizeof ls64);
 		break;
 	default:
 		break;
+	}
 	return error;