From owner-p4-projects@FreeBSD.ORG  Wed Sep  6 19:40:32 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 899A416A4DF; Wed,  6 Sep 2006 19:40:32 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 5AB1316A4DD
	for <perforce@freebsd.org>; Wed,  6 Sep 2006 19:40:32 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2891243D45
	for <perforce@freebsd.org>; Wed,  6 Sep 2006 19:40:32 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k86JeVt9049450
	for <perforce@freebsd.org>; Wed, 6 Sep 2006 19:40:31 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k86JeVQQ049447
	for perforce@freebsd.org; Wed, 6 Sep 2006 19:40:31 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 6 Sep 2006 19:40:31 GMT
Message-Id: <200609061940.k86JeVQQ049447@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 105732 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Wed, 06 Sep 2006 19:40:32 -0000

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

Change 105732 by imp@imp_lighthouse on 2006/09/06 19:39:43

	Check malloc for success/failure.

Affected files ...

.. //depot/projects/arm/src/sys/dev/iicbus/iic.c#5 edit

Differences ...

==== //depot/projects/arm/src/sys/dev/iicbus/iic.c#5 (text+ko) ====

@@ -282,6 +282,10 @@
 			break;
 		}
 		buf = malloc((unsigned long)s->count, M_TEMP, M_WAITOK);
+		if (buf == NULL) {
+			error = ENOMEM;
+			break;
+		}
 		error = copyin(s->buf, buf, s->count);
 		if (error)
 			break;
@@ -294,6 +298,10 @@
 			break;
 		}
 		buf = malloc((unsigned long)s->count, M_TEMP, M_WAITOK);
+		if (buf == NULL) {
+			error = ENOMEM;
+			break;
+		}
 		error = iicbus_read(parent, buf, s->count, &count, s->last, 10);
 		if (error)
 			break;
@@ -302,7 +310,15 @@
 
 	case I2CRDWR:
 		buf = malloc(sizeof(*d->msgs) * d->nmsgs, M_TEMP, M_WAITOK);
+		if (buf == NULL) {
+			error = ENOMEM;
+			break;
+		}
 		usrbufs = malloc(sizeof(void *) * d->nmsgs, M_TEMP, M_ZERO | M_WAITOK);
+		if (usrbufs == NULL) {
+			error = ENOMEM;
+			break;
+		}
 		error = copyin(d->msgs, buf, sizeof(*d->msgs) * d->nmsgs);
 		if (error)
 			break;