From ee9586205424c714206cac19273ca20ce51452cc Mon Sep 17 00:00:00 2001 From: rwatson Date: Tue, 15 Apr 2003 19:33:23 +0000 Subject: mac_init_mbuf_tag() accepts malloc flags, not mbuf allocator flags, so don't try and convert the argument flags to malloc flags, or we risk implicitly requesting blocking and generating witness warnings. Obtained from: TrustedBSD Project Sponsored by: DARPA, Network Associates Laboratories --- sys/security/mac/mac_framework.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'sys/security/mac/mac_framework.c') diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index 2650874..8524c0c 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -783,13 +783,12 @@ int mac_init_mbuf_tag(struct m_tag *tag, int flag) { struct label *label; - int error, trflag; + int error; label = (struct label *) (tag + 1); mac_init_label(label); - trflag = (flag == M_DONTWAIT ? M_NOWAIT : M_WAITOK); - MAC_CHECK(init_mbuf_label, label, trflag); + MAC_CHECK(init_mbuf_label, label, flag); if (error) { MAC_PERFORM(destroy_mbuf_label, label); mac_destroy_label(label); -- cgit v1.1