From owner-p4-projects@FreeBSD.ORG Sat Jul 9 18:04:03 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86F3216A420; Sat, 9 Jul 2005 18:04:03 +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 470E616A41C for ; Sat, 9 Jul 2005 18:04:03 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EEE7643D45 for ; Sat, 9 Jul 2005 18:04:02 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j69I42sq081218 for ; Sat, 9 Jul 2005 18:04:02 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j69I41Fj081215 for perforce@freebsd.org; Sat, 9 Jul 2005 18:04:01 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 9 Jul 2005 18:04:01 GMT Message-Id: <200507091804.j69I41Fj081215@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 79850 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Jul 2005 18:04:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=79850 Change 79850 by rwatson@rwatson_zoo on 2005/07/09 18:04:01 When the mount MAC Framework entry point was expanded to included a requested mount label, most policies were not updated to recognize the additional argument. Add it to the function declarations, and add comments where we likely should be doing something with the argument. Affected files ... .. //depot/projects/trustedbsd/sebsd/sys/security/mac_biba/mac_biba.c#15 edit .. //depot/projects/trustedbsd/sebsd/sys/security/mac_lomac/mac_lomac.c#16 edit .. //depot/projects/trustedbsd/sebsd/sys/security/mac_mls/mac_mls.c#14 edit .. //depot/projects/trustedbsd/sebsd/sys/security/mac_stub/mac_stub.c#12 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/sys/security/mac_biba/mac_biba.c#15 (text+ko) ==== @@ -906,10 +906,12 @@ static void mac_biba_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) + struct label *mntlabel, struct label *fslabel, + struct label *mount_arg_label) { struct mac_biba *source, *dest; + /* XXXRW: No use of mount_arg_label here yet. */ source = SLOT(cred->cr_label); dest = SLOT(mntlabel); mac_biba_copy_effective(source, dest); ==== //depot/projects/trustedbsd/sebsd/sys/security/mac_lomac/mac_lomac.c#16 (text+ko) ==== @@ -965,10 +965,12 @@ static void mac_lomac_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) + struct label *mntlabel, struct label *fslabel, + struct label *mount_arg_label) { struct mac_lomac *source, *dest; + /* XXXRW: No use of mount_arg_label here yet. */ source = SLOT(cred->cr_label); dest = SLOT(mntlabel); mac_lomac_copy_single(source, dest); ==== //depot/projects/trustedbsd/sebsd/sys/security/mac_mls/mac_mls.c#14 (text+ko) ==== @@ -873,10 +873,12 @@ static void mac_mls_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) + struct label *mntlabel, struct label *fslabel, + struct label *mount_arg_label) { struct mac_mls *source, *dest; + /* XXXRW: No use of mount_arg_label here yet. */ source = SLOT(cred->cr_label); dest = SLOT(mntlabel); mac_mls_copy_effective(source, dest); ==== //depot/projects/trustedbsd/sebsd/sys/security/mac_stub/mac_stub.c#12 (text+ko) ==== @@ -217,7 +217,8 @@ static void stub_create_mount(struct ucred *cred, struct mount *mp, - struct label *mntlabel, struct label *fslabel) + struct label *mntlabel, struct label *fslabel, + struct label *mount_arg_label) { }