From owner-p4-projects@FreeBSD.ORG  Wed Jul  5 18:10:32 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EAAF916A4E5; Wed,  5 Jul 2006 18:10:31 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 C6D7B16A4E0
	for <perforce@freebsd.org>; Wed,  5 Jul 2006 18:10:31 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8E14543D6A
	for <perforce@freebsd.org>; Wed,  5 Jul 2006 18:10:31 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k65IAVtC036459
	for <perforce@freebsd.org>; Wed, 5 Jul 2006 18:10:31 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65IAVuo036456
	for perforce@freebsd.org; Wed, 5 Jul 2006 18:10:31 GMT
	(envelope-from jhb@freebsd.org)
Date: Wed, 5 Jul 2006 18:10:31 GMT
Message-Id: <200607051810.k65IAVuo036456@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100645 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 05 Jul 2006 18:10:32 -0000

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

Change 100645 by jhb@jhb_mutex on 2006/07/05 18:10:29

	Use kern_connect() and axe stackgap usage.

Affected files ...

.. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_other.c#8 edit

Differences ...

==== //depot/projects/smpng/sys/i386/ibcs2/ibcs2_other.c#8 (text+ko) ====

@@ -35,7 +35,9 @@
 #include <sys/systm.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
+#include <sys/syscallsubr.h>
 #include <sys/sysproto.h>
+#include <sys/un.h>
 
 #include <i386/ibcs2/ibcs2_types.h>
 #include <i386/ibcs2/ibcs2_signal.h>
@@ -85,10 +87,8 @@
 spx_open(struct thread *td)
 {
 	struct socket_args sock;
-	struct connect_args conn;
-	struct sockaddr_un *Xaddr;
+	struct sockaddr_un sun;
 	int fd, error;
-	caddr_t sg = stackgap_init();
 
 	/* obtain a socket. */
 	DPRINTF(("SPX: open socket\n"));
@@ -98,19 +98,16 @@
 	error = socket(td, &sock);
 	if (error)
 		return error;
+	fd = td->td_retval[0];
 
 	/* connect the socket to standard X socket */
 	DPRINTF(("SPX: connect to /tmp/X11-unix/X0\n"));
-	Xaddr = stackgap_alloc(&sg, sizeof(struct sockaddr_un));
-	Xaddr->sun_family = AF_UNIX;
-	Xaddr->sun_len = sizeof(struct sockaddr_un) - sizeof(Xaddr->sun_path) +
-	  strlen(Xaddr->sun_path) + 1;
-	copyout("/tmp/.X11-unix/X0", Xaddr->sun_path, 18);
+	sun.sun_family = AF_UNIX;
+	strcpy(sun.sun_path, "/tmp/.X11-unix/X0");
+	sun.sun_len = sizeof(struct sockaddr_un) - sizeof(sun.sun_path) +
+	    strlen(sun.sun_path) + 1;
 
-	conn.s = fd = td->td_retval[0];
-	conn.name = (caddr_t)Xaddr;
-	conn.namelen = sizeof(struct sockaddr_un);
-	error = connect(td, &conn);
+	error = kern_connect(td, fd, (struct sockaddr *)&sun);
 	if (error) {
 		struct close_args cl;
 		cl.fd = fd;