From owner-p4-projects@FreeBSD.ORG Wed Aug 30 21:26:09 2006 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 160D216A4DF; Wed, 30 Aug 2006 21:26:09 +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 D575A16A4DD for ; Wed, 30 Aug 2006 21:26:08 +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 85E0843D49 for ; Wed, 30 Aug 2006 21:26:08 +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 k7ULQ85G037863 for ; Wed, 30 Aug 2006 21:26:08 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7ULQ8lF037860 for perforce@freebsd.org; Wed, 30 Aug 2006 21:26:08 GMT (envelope-from millert@freebsd.org) Date: Wed, 30 Aug 2006 21:26:08 GMT Message-Id: <200608302126.k7ULQ8lF037860@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 105366 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: Wed, 30 Aug 2006 21:26:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=105366 Change 105366 by millert@millert_g4tower on 2006/08/30 21:26:00 Correct label allocation for sysv message queues. This brings the API back into line with FreeBSD, corrects a bug, and correctly manages label storage entirely with the MAC Framework Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_msg.c#4 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#3 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_msg.c#3 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/bsd/kern/sysv_msg.c#4 (text+ko) ==== @@ -239,7 +239,7 @@ msqids[i].u.msg_qbytes = 0; /* implies entry is available */ msqids[i].u.msg_perm.seq = 0; /* reset to a known value */ #ifdef MAC - mac_sysvmsq_init(msqids[i].label); + mac_sysvmsq_init(&msqids[i]); #endif } } @@ -383,7 +383,7 @@ msqptr->u.msg_qbytes = 0; /* Mark it as free */ #ifdef MAC - mac_sysvmsq_cleanup(msqptr->label); + mac_sysvmsq_cleanup(msqptr); #endif wakeup((caddr_t)msqptr); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#3 (text+ko) ==== @@ -98,7 +98,7 @@ void mac_proc_init(struct proc *); int mac_socket_init(struct socket *, int waitok); void mac_sysvmsg_init(struct msg *); -void mac_sysvmsq_init(struct label *); +void mac_sysvmsq_init(struct msqid_kernel *msqptr); void mac_sysvsem_init(struct semid_kernel*); void mac_sysvshm_init(struct shmid_kernel*); void mac_vnode_init(struct vnode *vp); @@ -248,7 +248,7 @@ * object to a pool. This hook does not replace the mac_destroy hooks. */ void mac_sysvmsg_cleanup(struct msg *msgptr); -void mac_sysvmsq_cleanup(struct label *msqlabel); +void mac_sysvmsq_cleanup(struct msqid_kernel *msqptr); void mac_sysvsem_cleanup(struct semid_kernel *semakptr); void mac_sysvshm_cleanup(struct shmid_kernel *shmsegptr); void mac_vnode_cleanup(struct vnode *vp); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_msg.c#3 (text+ko) ==== @@ -50,9 +50,10 @@ } void -mac_sysvmsq_init(struct label *label) +mac_sysvmsq_init(struct msqid_kernel *msqptr) { - label = mac_sysv_msgqueue_alloc_label(); + + msqptr->label = mac_sysv_msgqueue_alloc_label(); } void @@ -79,10 +80,10 @@ } void -mac_sysvmsq_cleanup(struct label *msqlabel) +mac_sysvmsq_cleanup(struct msqid_kernel *msqptr) { - MAC_PERFORM(sysvmsq_cleanup, msqlabel); + MAC_PERFORM(sysvmsq_cleanup, msqptr->label); } int