CVS commit: src/sys/kern

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Mon Jun 29 15:44:45 UTC 2015

Modified Files:
        src/sys/kern: sys_mqueue.c

Log Message:
CID 1308958: Fix reversed arguments in copyin(9)


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/kern/sys_mqueue.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/kern/sys_mqueue.c
diff -u src/sys/kern/sys_mqueue.c:1.38 src/sys/kern/sys_mqueue.c:1.39
--- src/sys/kern/sys_mqueue.c:1.38	Sat Jun 20 10:41:54 2015
+++ src/sys/kern/sys_mqueue.c	Mon Jun 29 11:44:45 2015
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_mqueue.c,v 1.38 2015/06/20 14:41:54 martin Exp $	*/
+/*	$NetBSD: sys_mqueue.c,v 1.39 2015/06/29 15:44:45 christos Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Mindaugas Rasiukevicius <rmind at NetBSD org>
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_mqueue.c,v 1.38 2015/06/20 14:41:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_mqueue.c,v 1.39 2015/06/29 15:44:45 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -618,8 +618,8 @@ sys_mq_open(struct lwp *l, const struct 
 	struct mq_attr *attr = NULL, a;
 	int error;
 
-	if ((SCARG(uap, oflag) & O_CREAT) && (SCARG(uap,attr) != NULL)) {
-		error = copyin(&a, SCARG(uap,attr), sizeof(a));
+	if ((SCARG(uap, oflag) & O_CREAT) != 0 && SCARG(uap, attr) != NULL) {
+		error = copyin(SCARG(uap, attr), &a, sizeof(a));
 		if (error)
 			return error;
 		attr = &a;