Date: Sat, 31 May 2003 15:00:58 -0700 (PDT) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 32230 for review Message-ID: <200305312200.h4VM0wGI043092@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=32230 Change 32230 by rwatson@rwatson_tislabs on 2003/05/31 15:00:05 execlabel is not always defined; if execlabel isn't defined, don't run assertions on it. execlabel will be a cred label when it is defined. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#103 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#103 (text+ko) ==== @@ -954,7 +954,9 @@ ASSERT_CRED_LABEL(&new->cr_label); ASSERT_VNODE_LABEL(filelabel); ASSERT_VNODE_LABEL(interpvnodelabel); - ASSERT_VNODE_LABEL(execlabel); + if (execlabel != NULL) { + ASSERT_CRED_LABEL(execlabel); + } } static int @@ -966,7 +968,9 @@ ASSERT_CRED_LABEL(&old->cr_label); ASSERT_VNODE_LABEL(filelabel); ASSERT_VNODE_LABEL(interpvnodelabel); - ASSERT_VNODE_LABEL(execlabel); + if (execlabel != NULL) { + ASSERT_CRED_LABEL(execlabel); + } return (0); } @@ -1457,7 +1461,9 @@ ASSERT_CRED_LABEL(&cred->cr_label); ASSERT_VNODE_LABEL(label); - ASSERT_VNODE_LABEL(execlabel); + if (execlabel != NULL) { + ASSERT_CRED_LABEL(execlabel); + } return (0); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305312200.h4VM0wGI043092>