Date: Thu, 31 Oct 2002 08:38:42 -0800 (PST) From: Brian Feldman <green@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 20481 for review Message-ID: <200210311638.g9VGcgmU092884@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=20481 Change 20481 by green@green_laptop_2 on 2002/10/31 08:38:11 Make sure all the allocations in maybe_demote() occur without sleeping. Affected files ... .. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#31 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#31 (text+ko) ==== @@ -547,7 +547,7 @@ } mtx_unlock(&subj->mtx); if (mac_lomac_to_string(NULL, 0, &len, subjlabel) == 0 && - (text = malloc(len + 1, M_MACLOMAC, M_WAITOK)) != NULL) { + (text = malloc(len + 1, M_MACLOMAC, M_NOWAIT)) != NULL) { if (mac_lomac_to_string(text, len + 1, &len, subjlabel) == 0) subjlabeltext = text; @@ -555,7 +555,7 @@ free(text, M_MACLOMAC); } if (mac_lomac_to_string(NULL, 0, &len, objlabel) == 0 && - (text = malloc(len + 1, M_MACLOMAC, M_WAITOK)) != NULL) { + (text = malloc(len + 1, M_MACLOMAC, M_NOWAIT)) != NULL) { if (mac_lomac_to_string(text, len + 1, &len, objlabel) == 0) objlabeltext = text; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200210311638.g9VGcgmU092884>