From owner-p4-projects Fri Oct 18 11:30: 6 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4C8A37B40C; Fri, 18 Oct 2002 11:30:01 -0700 (PDT) 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 D8ABB37B4A5 for ; Fri, 18 Oct 2002 11:29:57 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7567D43E3B for ; Fri, 18 Oct 2002 11:29:57 -0700 (PDT) (envelope-from green@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9IIThmV069166 for ; Fri, 18 Oct 2002 11:29:43 -0700 (PDT) (envelope-from green@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9IITgQO069163 for perforce@freebsd.org; Fri, 18 Oct 2002 11:29:42 -0700 (PDT) Date: Fri, 18 Oct 2002 11:29:42 -0700 (PDT) Message-Id: <200210181829.g9IITgQO069163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f From: Brian Feldman Subject: PERFORCE change 19565 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=19565 Change 19565 by green@green_laptop_2 on 2002/10/18 11:29:35 * In SEBSD, since we're generally not allowed to just relabel a process, return EPERM instead of 0. * Remove the relabel_vnode printf(). * Fix arguments to internalization which were not synched properly. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#47 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/sebsd/sebsd.c#47 (text+ko) ==== @@ -236,7 +236,7 @@ sebsd_check_cred_relabel(struct ucred *cred, struct label *newlabel) { printf("sebsd_check_cred_relabel:: This does nothing\n"); - return 0; + return EPERM; } static void @@ -497,7 +497,7 @@ static int sebsd_internalize_sid(security_id_t *sidp, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + char *element_data, int *claimed) { char context[128]; size_t context_len; @@ -516,24 +516,24 @@ static int sebsd_internalize_cred_label(struct label *label, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + char *element_data, int *claimed) { struct task_security_struct *tsec; tsec = SLOT(label); - return (sebsd_internalize_sid(&tsec->sid, element_name, - element_data, size, len, claimed)); + return (sebsd_internalize_sid(&tsec->sid, element_name, element_data, + claimed)); } static int sebsd_internalize_vnode_label(struct label *label, char *element_name, - char *element_data, size_t size, size_t *len, int *claimed) + char *element_data, int *claimed) { struct vnode_security_struct *vsec; vsec = SLOT(label); - return (sebsd_internalize_sid(&vsec->sid, element_name, - element_data, size, len, claimed)); + return (sebsd_internalize_sid(&vsec->sid, element_name, element_data, + claimed)); } static void @@ -557,9 +557,6 @@ return; } - printf("relabel_vnode:: source=%d, dest=%d\n", source->sid, - dest->sid); - if ((vp->v_mount->mnt_flag & MNT_MULTILABEL) == 0) { return; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message