From owner-trustedbsd-cvs@FreeBSD.ORG Mon Jan 22 16:21:19 2007 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E581E16A405 for ; Mon, 22 Jan 2007 16:21:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id 0D96913C441 for ; Mon, 22 Jan 2007 16:21:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by cyrus.watson.org (Postfix) with ESMTP id 6FF95491DC for ; Mon, 22 Jan 2007 11:21:16 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [69.147.83.54]) by mx2.freebsd.org (Postfix) with ESMTP id 1C4865B653; Mon, 22 Jan 2007 16:21:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 1457A16A402; Mon, 22 Jan 2007 16:21:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E737516A401 for ; Mon, 22 Jan 2007 16:21:14 +0000 (UTC) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D60BC13C45E for ; Mon, 22 Jan 2007 16:21:14 +0000 (UTC) (envelope-from millert@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 l0MGLEPX030156 for ; Mon, 22 Jan 2007 16:21:14 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l0MGLEln030153 for perforce@freebsd.org; Mon, 22 Jan 2007 16:21:14 GMT (envelope-from millert@freebsd.org) Date: Mon, 22 Jan 2007 16:21:14 GMT Message-Id: <200701221621.l0MGLEln030153@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to millert@freebsd.org using -f From: Todd Miller To: Perforce Change Reviews Cc: Subject: PERFORCE change 113360 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Jan 2007 16:21:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=113360 Change 113360 by millert@millert_macbook on 2007/01/22 16:20:34 Add includes, __unused and cast to quiet gcc warnings Add back code mistakenly removed during rc==22 (EINVAL) changes that broke mac_request_label(). Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#6 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/osfmk/kern/security.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005, 2006 SPARTA, Inc. + * Copyright (c) 2005-2007 SPARTA, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,9 +28,11 @@ #include #include #include +#include #include #include #include +#include kern_return_t mach_get_task_label( @@ -98,7 +100,7 @@ kern_return_t mac_check_service( - ipc_space_t space, + __unused ipc_space_t space, labelstr_t subj, labelstr_t obj, labelstr_t serv, @@ -161,7 +163,7 @@ return kr; } - dead = ipc_right_check(space, entry->ie_object, obj, entry); + dead = ipc_right_check(space, (ipc_port_t) entry->ie_object, obj, entry); if (dead) { is_write_unlock(space); mac_task_label_destroy(&subjl); @@ -290,7 +292,11 @@ io_unlock(objp); ipc_port_multiple_unlock(); - kr = rc ? KERN_NO_ACCESS : KERN_SUCCESS; + if (rc == 0) + kr = labelh_new_user(space, &outl, outlabel); + else + kr = KERN_NO_ACCESS; + if (kr != KERN_SUCCESS) mac_port_label_destroy(&outl);