PERFORCE change 20481 for review

[Brian Feldman]

http://perforce.freebsd.org/chv.cgi?CH=20481

Change 20481 by green at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message