From owner-p4-projects@FreeBSD.ORG  Fri Nov  7 18:22:31 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1DDDD16A4D0; Fri,  7 Nov 2003 18:22:31 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D459216A4CE
	for <perforce@freebsd.org>; Fri,  7 Nov 2003 18:22:30 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 447E643FD7
	for <perforce@freebsd.org>; Fri,  7 Nov 2003 18:22:30 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA82MUXJ008091
	for <perforce@freebsd.org>; Fri, 7 Nov 2003 18:22:30 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA82MTI6008088
	for perforce@freebsd.org; Fri, 7 Nov 2003 18:22:29 -0800 (PST)
	(envelope-from cvance@nailabs.com)
Date: Fri, 7 Nov 2003 18:22:29 -0800 (PST)
Message-Id: <200311080222.hA82MTI6008088@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41699 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Nov 2003 02:22:31 -0000

http://perforce.freebsd.org/chv.cgi?CH=41699

Change 41699 by cvance@cvance_osx_laptop on 2003/11/07 18:21:55

	On Darwin, you can't pass NULL as the last argument to copyinstr.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vfs_syscalls.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/vfs/vfs_syscalls.c#7 (text+ko) ====

@@ -3982,6 +3982,7 @@
 	struct nameidata nd;
 	struct mount *mp, *mp_writable;
 	char attrname[EXTATTR_MAXNAMELEN];
+	size_t dummy;
 	int error;
 
 	/*
@@ -3990,7 +3991,7 @@
 	 */
 	if (uap->attrname != NULL) {
 		error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN,
-		    NULL);
+		    &dummy);
 		if (error)
 			return (error);
 	}
@@ -4112,9 +4113,10 @@
 {
 	struct file *fp;
 	char attrname[EXTATTR_MAXNAMELEN];
+	size_t dummy;
 	int error;
 
-	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL);
+	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, &dummy);
 	if (error)
 		return (error);
 
@@ -4144,9 +4146,10 @@
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
+	size_t dummy;
 	int error;
 
-	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL);
+	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, &dummy);
 	if (error)
 		return (error);
 
@@ -4178,9 +4181,10 @@
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
+	size_t dummy;
 	int error;
 
-	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL);
+	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, &dummy);
 	if (error)
 		return (error);
 
@@ -4291,9 +4295,10 @@
 {
 	struct file *fp;
 	char attrname[EXTATTR_MAXNAMELEN];
+	size_t dummy;
 	int error;
 
-	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL);
+	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, &dummy);
 	if (error)
 		return (error);
 
@@ -4323,9 +4328,10 @@
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
+	size_t dummy;
 	int error;
 
-	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL);
+	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, &dummy);
 	if (error)
 		return (error);
 
@@ -4357,9 +4363,10 @@
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
+	size_t dummy;
 	int error;
 
-	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL);
+	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, &dummy);
 	if (error)
 		return (error);
 
@@ -4431,9 +4438,10 @@
 	struct file *fp;
 	struct vnode *vp;
 	char attrname[EXTATTR_MAXNAMELEN];
+	size_t dummy;
 	int error;
 
-	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL);
+	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, &dummy);
 	if (error)
 		return (error);
 
@@ -4460,9 +4468,10 @@
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
+	size_t dummy;
 	int error;
 
-	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL);
+	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, &dummy);
 	if (error)
 		return(error);
 
@@ -4491,9 +4500,10 @@
 {
 	struct nameidata nd;
 	char attrname[EXTATTR_MAXNAMELEN];
+	size_t dummy;
 	int error;
 
-	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, NULL);
+	error = copyinstr(uap->attrname, attrname, EXTATTR_MAXNAMELEN, &dummy);
 	if (error)
 		return(error);