From owner-trustedbsd-cvs@FreeBSD.ORG Thu Nov 16 21:32:44 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 9294916A407 for ; Thu, 16 Nov 2006 21:32:44 +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 E839E43D75 for ; Thu, 16 Nov 2006 21:32:34 +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 5AF0F46CC6 for ; Thu, 16 Nov 2006 16:32:34 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id B6E8B564FB; Thu, 16 Nov 2006 21:32:33 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id AEF7516A415; Thu, 16 Nov 2006 21:32:33 +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 89BA416A403 for ; Thu, 16 Nov 2006 21:32:33 +0000 (UTC) (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 2355443D6D for ; Thu, 16 Nov 2006 21:32:33 +0000 (GMT) (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 kAGLWX9a004307 for ; Thu, 16 Nov 2006 21:32:33 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAGLWWDh004304 for perforce@freebsd.org; Thu, 16 Nov 2006 21:32:32 GMT (envelope-from millert@freebsd.org) Date: Thu, 16 Nov 2006 21:32:32 GMT Message-Id: <200611162132.kAGLWWDh004304@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 110130 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: Thu, 16 Nov 2006 21:32:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=110130 Change 110130 by millert@millert_macbook on 2006/11/16 21:32:30 Some mac_file_check_fcntl fixes: - fix type of "arg", it should be user_long_t - add label arg to mpo_file_check_fcntl_t Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#8 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#20 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#29 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_file.c#8 (text+ko) ==== @@ -106,11 +106,12 @@ } int -mac_file_check_fcntl(struct ucred *cred, struct fileglob *fg, int cmd, long arg) +mac_file_check_fcntl(struct ucred *cred, struct fileglob *fg, int cmd, + user_long_t arg) { int error; - MAC_CHECK(file_check_fcntl, cred, fg, cmd, arg); + MAC_CHECK(file_check_fcntl, cred, fg, fg->fg_label, cmd, arg); return (error); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#20 (text+ko) ==== @@ -126,7 +126,7 @@ int mac_file_check_create(struct ucred *cred); int mac_file_check_dup(struct ucred *cred, struct fileglob *fg, int newfd); int mac_file_check_fcntl(struct ucred *cred, struct fileglob *fg, int cmd, - long arg); + user_long_t arg); int mac_file_check_get(struct ucred *cred, struct fileglob *fg, char *elements, int len); int mac_file_check_get_offset(struct ucred *cred, struct fileglob *fg); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_policy.h#29 (text+ko) ==== @@ -633,6 +633,7 @@ @brief Access control check for fcntl @param cred Subject credential @param fg Fileglob structure + @param label Policy label for fg @param cmd Control operation to be performed; see fcntl(2) @param arg fcnt arguments; see fcntl(2) @@ -645,8 +646,9 @@ typedef int mpo_file_check_fcntl_t( struct ucred *cred, struct fileglob *fg, + struct label *label, int cmd, - long arg + user_long_t arg ); /** @brief Access control check for mac_get_fd