From owner-p4-projects@FreeBSD.ORG  Fri Jun 26 17:35:54 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EA4521065674; Fri, 26 Jun 2009 17:35:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A7FAA1065672
	for <perforce@FreeBSD.org>; Fri, 26 Jun 2009 17:35:53 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 95F8D8FC16
	for <perforce@FreeBSD.org>; Fri, 26 Jun 2009 17:35:53 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5QHZrlo050786
	for <perforce@FreeBSD.org>; Fri, 26 Jun 2009 17:35:53 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5QHZrdu050784
	for perforce@freebsd.org; Fri, 26 Jun 2009 17:35:53 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Fri, 26 Jun 2009 17:35:53 GMT
Message-Id: <200906261735.n5QHZrdu050784@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 165262 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: Fri, 26 Jun 2009 17:35:54 -0000

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

Change 165262 by pgj@petymeg-current on 2009/06/26 17:35:05

	Fix passing of unix socket addresses

Affected files ...

.. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_usrreq.c#4 edit

Differences ...

==== //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_usrreq.c#4 (text+ko) ====

@@ -1500,6 +1500,7 @@
 	struct unpcb *unp, **unp_list;
 	struct unp_head *head;
 	struct socket *sock;
+	struct sockaddr_un *sa;
 
 	error = 0;
 	head = ((intptr_t)arg1 == SOCK_DGRAM ? &unp_dhead : &unp_shead);
@@ -1569,10 +1570,11 @@
 			ud.ud_conn = (u_long)unp->unp_conn;
 			ud.ud_refs = (u_long)LIST_FIRST(&unp->unp_refs);
 			ud.ud_reflink = (u_long)LIST_NEXT(unp, unp_reflink);
-			ud.ud_address_len = (unp->unp_addr != NULL) ?
-			    unp->unp_addr->sun_len : 0;
-			if (ud.ud_address_len > 0) {
-				bcopy(ud.ud_address, unp->unp_addr,
+			if (unp->unp_addr != NULL) {
+				sa = unp->unp_addr;
+				ud.ud_address_len = sa->sun_len
+				    - offsetof(struct sockaddr_un, sun_path);
+				bcopy(sa->sun_path, ud.ud_address,
 				    ud.ud_address_len);
 			}
 			UNP_PCB_UNLOCK(unp);