From owner-trustedbsd-cvs@FreeBSD.ORG Tue Mar 7 16:33:52 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 151C016A427 for ; Tue, 7 Mar 2006 16:33:52 +0000 (GMT) (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 6783143D48 for ; Tue, 7 Mar 2006 16:33:51 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id 94CF046B28 for ; Tue, 7 Mar 2006 11:33:29 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id E484556B0A; Tue, 7 Mar 2006 16:33:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id D4C2316A423; Tue, 7 Mar 2006 16:33:49 +0000 (GMT) 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 9845B16A420 for ; Tue, 7 Mar 2006 16:33:49 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48C0A43D49 for ; Tue, 7 Mar 2006 16:33:49 +0000 (GMT) (envelope-from millert@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k27GXnU2005565 for ; Tue, 7 Mar 2006 16:33:49 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GXmik005562 for perforce@freebsd.org; Tue, 7 Mar 2006 16:33:48 GMT (envelope-from millert@freebsd.org) Date: Tue, 7 Mar 2006 16:33:48 GMT Message-Id: <200603071633.k27GXmik005562@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 92916 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: Tue, 07 Mar 2006 16:33:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=92916 Change 92916 by millert@millert_ibook on 2006/03/07 16:32:57 Fix some style nits. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#9 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#6 edit .. //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.c#5 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/ipc_kmsg.c#9 (text+ko) ==== @@ -236,8 +236,8 @@ #ifdef MAC if (kmsg->ikm_sender != NULL) { - labelh_release (kmsg->ikm_sender); - kmsg->ikm_sender = NULL; + labelh_release(kmsg->ikm_sender); + kmsg->ikm_sender = NULL; } #endif @@ -608,8 +608,8 @@ #ifdef MAC if (kmsg->ikm_sender != NULL) { - labelh_release (kmsg->ikm_sender); - kmsg->ikm_sender = NULL; + labelh_release (kmsg->ikm_sender); + kmsg->ikm_sender = NULL; } #endif } @@ -716,12 +716,10 @@ #ifdef MAC task_t cur = current_thread()->top_act->task; - if (cur) - { - labelh_reference (cur->label); - kmsg->ikm_sender = cur->label; - } - else + if (cur) { + labelh_reference(cur->label); + kmsg->ikm_sender = cur->label; + } else trailer->msgh_labels.sender = 0; #else trailer->msgh_labels.sender = 0; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/ipc/mach_port.c#6 (text+ko) ==== @@ -1836,12 +1836,16 @@ } kern_return_t -mach_set_port_label (ipc_space_t space, mach_port_name_t name, vm_offset_t labelstr) +mach_set_port_label( + ipc_space_t space, + mach_port_name_t name, + vm_offset_t labelstr) { #ifdef MAC ipc_entry_t entry; kern_return_t kr; struct label inl; + int rc; if (space == IS_NULL || space->is_task == NULL) return KERN_INVALID_TASK; @@ -1849,32 +1853,33 @@ if (!MACH_PORT_VALID(name)) return KERN_INVALID_NAME; - mac_init_port_label (&inl); - int rc = mac_internalize_port_label (&inl, labelstr); + mac_init_port_label(&inl); + rc = mac_internalize_port_label(&inl, labelstr); if (rc) - return KERN_INVALID_ARGUMENT; + return KERN_INVALID_ARGUMENT; kr = ipc_right_lookup_write(space, name, &entry); if (kr != KERN_SUCCESS) return kr; - if (IOT_PORT != io_otype(entry->ie_object)) { - is_write_unlock (space); - return KERN_INVALID_RIGHT; + if (io_otype(entry->ie_object) != IOT_PORT) { + is_write_unlock(space); + return KERN_INVALID_RIGHT; } ipc_port_t port = (ipc_port_t) entry->ie_object; - ip_lock (port); + ip_lock(port); - rc = mac_check_port_relabel (&space->is_task->maclabel, &port->ip_label, &inl); + rc = mac_check_port_relabel(&space->is_task->maclabel, + &port->ip_label, &inl); if (rc) - kr = KERN_NO_ACCESS; + kr = KERN_NO_ACCESS; else - mac_copy_port_label (&inl, &port->ip_label); + mac_copy_port_label(&inl, &port->ip_label); - ip_unlock (port); - is_write_unlock (space); + ip_unlock(port); + is_write_unlock(space); return kr; #else return KERN_INVALID_ARGUMENT; ==== //depot/projects/trustedbsd/sedarwin7/src/darwin/xnu/osfmk/kern/task.c#5 (text+ko) ==== @@ -381,9 +381,8 @@ eml_task_reference(new_task, parent_task); #ifdef MAC - /*mutex_init(&new_task->labellock, ETAP_NO_TRACE);*/ - new_task->label = labelh_new (); - mac_init_task_label (&new_task->maclabel); + new_task->label = labelh_new(); + mac_init_task_label(&new_task->maclabel); #endif ipc_task_init(new_task, parent_task); @@ -471,8 +470,7 @@ task_lock(task); #ifdef MAC - /* Prevent task from being destroyed while the label is - still in use */ + /* Prevent task from being destroyed while the label is still in use */ tasklabel_lock(task); #endif refs = --task->ref_count; @@ -1806,5 +1804,4 @@ (*f)(&pt->maclabel, arg); tasklabel_unlock(pt); } - #endif