Date: Mon, 22 Jan 2007 15:56:32 GMT From: Todd Miller <millert@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 113340 for review Message-ID: <200701221556.l0MFuWtx024426@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=113340 Change 113340 by millert@millert_macbook on 2007/01/22 15:55:36 Minor cleanup: Add SPAWAR contract number in comments Remove NULL mbuf label check that is no longer needed No need for error variable when using MAC_INTERNALIZE/MAC_EXTERNALIZE Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#11 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_net.c#11 (text+ko) ==== @@ -13,6 +13,9 @@ * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), * as part of the DARPA CHATS research program. * + * This software was enhanced by SPARTA ISSO under SPAWAR contract + * N66001-04-C-6019 ("SEFOS"). + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -210,9 +213,6 @@ src_label = mac_mbuf_to_label(m_from); dest_label = mac_mbuf_to_label(m_to); - if (src_label == NULL || dest_label == NULL) - return; - MAC_PERFORM(mbuf_label_copy, src_label, dest_label); } @@ -227,21 +227,15 @@ mac_ifnet_label_externalize(struct label *label, char *elements, char *outbuf, size_t outbuflen) { - int error; - error = MAC_EXTERNALIZE(ifnet, label, elements, outbuf, outbuflen); - - return (error); + return (MAC_EXTERNALIZE(ifnet, label, elements, outbuf, outbuflen)); } static int mac_ifnet_label_internalize(struct label *label, char *string) { - int error; - error = MAC_INTERNALIZE(ifnet, label, string); - - return (error); + return (MAC_INTERNALIZE(ifnet, label, string)); } void
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200701221556.l0MFuWtx024426>