From owner-p4-projects@FreeBSD.ORG  Wed Oct 29 21:23:42 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4479616A4D1; Wed, 29 Oct 2003 21:23:42 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1FC0B16A4CF
	for <perforce@freebsd.org>; Wed, 29 Oct 2003 21:23:42 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8D85F43F85
	for <perforce@freebsd.org>; Wed, 29 Oct 2003 21:23:41 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9U5NfXJ095559
	for <perforce@freebsd.org>; Wed, 29 Oct 2003 21:23:41 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9U5NfhF095556
	for perforce@freebsd.org; Wed, 29 Oct 2003 21:23:41 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 29 Oct 2003 21:23:41 -0800 (PST)
Message-Id: <200310300523.h9U5NfhF095556@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 40803 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Oct 2003 05:23:42 -0000

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

Change 40803 by rwatson@rwatson_paprika on 2003/10/29 21:23:38

	M_WAITOK doesn't fail with normal kernel malloc().
	
	Pointed out by:	rishi

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/uipc_sem.c#15 (text+ko) ====

@@ -226,8 +226,7 @@
 	/* XXX Use p31b_getcfg(CTL_P1003_1B_SEM_VALUE_MAX) instead? */
 	if (value > SEM_VALUE_MAX)
 		return (EINVAL);
-	if( (ret = malloc(sizeof(*ret), M_SEM, M_WAITOK | M_ZERO)) == NULL)
-		return (ENOMEM);
+	ret = malloc(sizeof(*ret), M_SEM, M_WAITOK | M_ZERO);
 	if (name != NULL) {
 		len = strlen(name);
 		if (len > SEM_MAX_NAMELEN) {
@@ -239,10 +238,7 @@
 			free(ret, M_SEM);
 			return (EINVAL);
 		}
-		if( (ret->ks_name = malloc(len + 1, M_SEM, M_WAITOK)) == NULL){
-			free(ret, M_SEM);
-			return (ENOMEM);
-		}
+		ret->ks_name = malloc(len + 1, M_SEM, M_WAITOK);
 		strcpy(ret->ks_name, name);
 	} else {
 		ret->ks_name = NULL;
@@ -597,8 +593,7 @@
 
 	mtx_assert(&sem_lock, MA_NOTOWNED);
 	mtx_assert(&ks->ks_mtx, MA_NOTOWNED);
-	if( (ku = malloc(sizeof(*ku), M_SEM, M_WAITOK | M_ZERO)) == NULL)
-		return;
+	ku = malloc(sizeof(*ku), M_SEM, M_WAITOK | M_ZERO);
 	ku->ku_pid = p->p_pid;
 	mtx_lock(&sem_lock);
 	k = sem_getuser(p, ks);