From owner-p4-projects@FreeBSD.ORG  Sat Nov 15 16:06:07 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0403916A4D0; Sat, 15 Nov 2003 16:06:07 -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 D1A6316A4CE
	for <perforce@freebsd.org>; Sat, 15 Nov 2003 16:06:06 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 053AD43F75
	for <perforce@freebsd.org>; Sat, 15 Nov 2003 16:06:06 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAG065XJ010752
	for <perforce@freebsd.org>; Sat, 15 Nov 2003 16:06:05 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAG065kQ010749
	for perforce@freebsd.org; Sat, 15 Nov 2003 16:06:05 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 15 Nov 2003 16:06:05 -0800 (PST)
Message-Id: <200311160006.hAG065kQ010749@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 42495 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: Sun, 16 Nov 2003 00:06:07 -0000

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

Change 42495 by rwatson@rwatson_tislabs on 2003/11/15 16:05:47

	For getsockopt() to retrieve MAC labels, we must copy in the
	struct mac so we know what labels to externalize.  This
	appears to fix SO_LABEL but not SO_PEERLABEL for reason I
	am still working on figuring out.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#55 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/uipc_socket.c#55 (text+ko) ====

@@ -1599,6 +1599,10 @@
 			break;
 		case SO_LABEL:
 #ifdef MAC
+			error = sooptcopyin(sopt, &extmac, sizeof(extmac),
+			    sizeof(extmac));
+			if (error)
+				return (error);
 			error = mac_getsockopt_label_get(
 			    sopt->sopt_td->td_ucred, so, &extmac);
 			if (error)
@@ -1610,6 +1614,10 @@
 			break;
 		case SO_PEERLABEL:
 #ifdef MAC
+			error = sooptcopyin(sopt, &extmac, sizeof(extmac),
+			    sizeof(extmac));
+			if (error)
+				return (error);
 			error = mac_getsockopt_peerlabel_get(
 			    sopt->sopt_td->td_ucred, so, &extmac);
 			if (error)