From owner-trustedbsd-cvs@FreeBSD.ORG Fri Feb 24 22:41: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 1A6C316A422 for ; Fri, 24 Feb 2006 22:41:44 +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 0B0F443D4C for ; Fri, 24 Feb 2006 22:41:43 +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 B4CE746B4C for ; Fri, 24 Feb 2006 17:41:25 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id BDAADD01B8; Fri, 24 Feb 2006 22:33:47 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 2982516A42B; Fri, 24 Feb 2006 22:33:46 +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 DE1EC16A426 for ; Fri, 24 Feb 2006 22:33:45 +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 9128643D45 for ; Fri, 24 Feb 2006 22:33:45 +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 k1OMXjid034402 for ; Fri, 24 Feb 2006 22:33:45 GMT (envelope-from millert@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1OMXjX8034399 for perforce@freebsd.org; Fri, 24 Feb 2006 22:33:45 GMT (envelope-from millert@freebsd.org) Date: Fri, 24 Feb 2006 22:33:45 GMT Message-Id: <200602242233.k1OMXjX8034399@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 92358 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: Fri, 24 Feb 2006 22:41:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=92358 Change 92358 by millert@millert_g4tower on 2006/02/24 22:32:55 Revert debugging code from last change here that was unintentionally submitted. Affected files ... .. //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#33 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin7/src/sedarwin/sedarwin/sebsd.c#33 (text+ko) ==== @@ -116,8 +116,6 @@ int sebsd_verbose = 0; -static struct label *last_dead_cred_label, *last_dead_task_label, *last_dead_port_label; // XXX - testing - static int slot = 1; /* TBD, dynamic */ #define SLOT(l) ((void *)LABEL_TO_SLOT((l), slot).l_ptr) @@ -485,24 +483,6 @@ static void sebsd_destroy_cred_label(struct label *label) { - // printk("sebsd_destroy_cred_label(%p)\n", &LABEL_TO_SLOT((label), slot)); - last_dead_cred_label = label; - sebsd_free (SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_destroy_task_label(struct label *label) -{ - last_dead_task_label = label; - sebsd_free (SLOT(label)); - SLOT(label) = NULL; -} - -static void -sebsd_destroy_port_label(struct label *label) -{ - last_dead_port_label = label; sebsd_free (SLOT(label)); SLOT(label) = NULL; } @@ -2363,13 +2343,7 @@ { struct task_security_struct *task; - /* XXX - SLOT should not return NULL but there is a signal race */ - /* XXX - this may be fixed... */ - if ((task = SLOT(label)) == NULL) { - printk("sebsd_externalize_cred_label: SLOT returned NULL!\n"); - printk("label: %p, last_task: %p, last_cred: %p, last_port: %p\n", label, last_dead_task_label, last_dead_cred_label, last_dead_port_label); // XXX - return (ESRCH); - } + task = SLOT(label); return (sebsd_externalize_sid(task->sid, element_name, sb)); } @@ -2665,8 +2639,8 @@ .mpo_destroy = sebsd_destroy, .mpo_destroy_cred_label = sebsd_destroy_cred_label, - .mpo_destroy_task_label = sebsd_destroy_task_label, - .mpo_destroy_port_label = sebsd_destroy_port_label, + .mpo_destroy_task_label = sebsd_destroy_cred_label, + .mpo_destroy_port_label = sebsd_destroy_cred_label, .mpo_destroy_vnode_label = sebsd_destroy_vnode_label, .mpo_destroy_devfsdirent_label = sebsd_destroy_vnode_label,