From owner-p4-projects Tue Mar 25 11:56:21 2003 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 64F0037B404; Tue, 25 Mar 2003 11:56:17 -0800 (PST) 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 024EF37B401 for ; Tue, 25 Mar 2003 11:56:17 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 92A2E43FB1 for ; Tue, 25 Mar 2003 11:56:16 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2PJuG0U092273 for ; Tue, 25 Mar 2003 11:56:16 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2PJuGSW092270 for perforce@freebsd.org; Tue, 25 Mar 2003 11:56:16 -0800 (PST) Date: Tue, 25 Mar 2003 11:56:16 -0800 (PST) Message-Id: <200303251956.h2PJuGSW092270@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 Subject: PERFORCE change 27369 for review To: Perforce Change Reviews X-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL,PATCH_UNIFIED_DIFF,X_AUTH_WARNING autolearn=ham version=2.50 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.50 (1.173-2003-02-20-exp) 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=27369 Change 27369 by rwatson@rwatson_tislabs on 2003/03/25 11:56:02 Make sure to pass in only malloc() flags to MAC allocation interfaces for labels, not mbuf allocation "how" arguments. Should clear up several Witness warnings involving blocking in the netisr path. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#29 edit .. //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#19 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/subr_mbuf.c#29 (text+ko) ==== @@ -1306,7 +1306,7 @@ if (mb != NULL) { _mbhdr_setup(mb, type); #ifdef MAC - if (mac_init_mbuf(mb, how) != 0) { + if (mac_init_mbuf(mb, MBUF_TO_MALLOC(how)) != 0) { m_free(mb); return NULL; } @@ -1355,7 +1355,7 @@ if (mb != NULL) { _mbhdr_setup(mb, type); #ifdef MAC - if (mac_init_mbuf(mb, how) != 0) { + if (mac_init_mbuf(mb, MBUF_TO_MALLOC(how)) != 0) { m_free(mb); return NULL; } @@ -1502,7 +1502,8 @@ _mext_init_ref(mb, &cl_refcntmap[cl2ref(mb->m_ext.ext_buf)]); } #ifdef MAC - if ((flags & M_PKTHDR) && (mac_init_mbuf(mb, how) != 0)) { + if ((flags & M_PKTHDR) && (mac_init_mbuf(mb, MBUF_TO_MALLOC(how)) + != 0)) { m_free(mb); return NULL; } ==== //depot/projects/trustedbsd/mac/sys/kern/uipc_mbuf.c#19 (text+ko) ==== @@ -89,7 +89,7 @@ to->m_data = to->m_pktdat; to->m_pkthdr = from->m_pkthdr; /* especially tags */ #ifdef MAC - mac_init_mbuf(to, 1); /* XXXMAC no way to fail */ + mac_init_mbuf(to, M_WAITOK); /* XXXMAC no way to fail */ mac_create_mbuf_from_mbuf(from, to); #endif SLIST_INIT(&from->m_pkthdr.tags); /* purge tags from src */ @@ -125,7 +125,7 @@ to->m_data = to->m_pktdat; to->m_pkthdr = from->m_pkthdr; #ifdef MAC - mac_init_mbuf(to, 1); /* XXXMAC no way to fail */ + mac_init_mbuf(to, M_WAITOK); /* XXXMAC no way to fail */ mac_create_mbuf_from_mbuf(from, to); #endif SLIST_INIT(&to->m_pkthdr.tags); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message