Date: Tue, 3 Oct 2006 14:32:03 GMT From: Todd Miller <millert@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 107173 for review Message-ID: <200610031432.k93EW3f0015576@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=107173 Change 107173 by millert@millert_macbook on 2006/10/03 14:31:39 mac_labelzone_alloc() uses MAC_NOWAIT/MAC_WAITOK not M_NOWAIT/M_WAITOK so be more consistent with the flags used. Affected files ... .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#6 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#5 edit .. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_msg.c#4 edit Differences ... ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_pipe.c#5 (text+ko) ==== @@ -57,7 +57,7 @@ { struct label *label; - label = mac_labelzone_alloc(M_WAITOK); + label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(pipe_init_label, label); return (label); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_process.c#6 (text+ko) ==== @@ -374,7 +374,7 @@ { struct label *label; - label = mac_labelzone_alloc(M_WAITOK); + label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(lctx_init_label, label); return (label); } ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_socket.c#5 (text+ko) ==== @@ -533,7 +533,7 @@ return (error); } - intlabel = mac_socket_alloc_label(M_WAITOK); + intlabel = mac_socket_alloc_label(MAC_WAITOK); error = mac_socket_internalize_label(intlabel, buffer); FREE(buffer, M_MACTEMP); if (error) @@ -566,7 +566,7 @@ } MALLOC(buffer, char *, mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - intlabel = mac_socket_alloc_label(M_WAITOK); + intlabel = mac_socket_alloc_label(MAC_WAITOK); mac_socket_copy_label(so->so_label, intlabel); error = mac_socket_externalize_label(intlabel, elements, buffer, mac->m_buflen); @@ -603,7 +603,7 @@ } MALLOC(buffer, char *, mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); - intlabel = mac_socket_alloc_label(M_WAITOK); + intlabel = mac_socket_alloc_label(MAC_WAITOK); mac_socket_copy_label(so->so_peerlabel, intlabel); error = mac_socket_peer_externalize_label(intlabel, elements, buffer, mac->m_buflen); ==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_sysv_msg.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ { struct label *label; - label = mac_labelzone_alloc(M_WAITOK); + label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(sysvmsg_init_label, label); return (label); } @@ -44,7 +44,7 @@ { struct label *label; - label = mac_labelzone_alloc(M_WAITOK); + label = mac_labelzone_alloc(MAC_WAITOK); MAC_PERFORM(sysvmsq_init_label, label); return (label); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200610031432.k93EW3f0015576>