From owner-svn-src-head@FreeBSD.ORG  Fri Jan 30 14:09:08 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 5437643F;
 Fri, 30 Jan 2015 14:09:08 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 40B69DC0;
 Fri, 30 Jan 2015 14:09:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0UE98M1052887;
 Fri, 30 Jan 2015 14:09:08 GMT (envelope-from loos@FreeBSD.org)
Received: (from loos@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0UE98SI052886;
 Fri, 30 Jan 2015 14:09:08 GMT (envelope-from loos@FreeBSD.org)
Message-Id: <201501301409.t0UE98SI052886@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: loos set sender to loos@FreeBSD.org
 using -f
From: Luiz Otavio O Souza <loos@FreeBSD.org>
Date: Fri, 30 Jan 2015 14:09:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r277928 - head/sys/dev/ofw
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2015 14:09:08 -0000

Author: loos
Date: Fri Jan 30 14:09:07 2015
New Revision: 277928
URL: https://svnweb.freebsd.org/changeset/base/277928

Log:
  Do not leak the OFW memory when the result does not satisfy our alignment
  requirement.
  
  While here, fix style(9) issues.

Modified:
  head/sys/dev/ofw/openfirm.c

Modified: head/sys/dev/ofw/openfirm.c
==============================================================================
--- head/sys/dev/ofw/openfirm.c	Fri Jan 30 13:03:36 2015	(r277927)
+++ head/sys/dev/ofw/openfirm.c	Fri Jan 30 14:09:07 2015	(r277928)
@@ -459,11 +459,16 @@ OF_getencprop_alloc(phandle_t package, c
 	int i;
 
 	retval = OF_getprop_alloc(package, name, elsz, buf);
-	if (retval == -1 || retval*elsz % 4 != 0)
+	if (retval == -1)
 		return (-1);
+ 	if (retval * elsz % 4 != 0) {
+		free(*buf, M_OFWPROP);
+		*buf = NULL;
+		return (-1);
+	}
 
 	cell = *buf;
-	for (i = 0; i < retval*elsz/4; i++)
+	for (i = 0; i < retval * elsz / 4; i++)
 		cell[i] = be32toh(cell[i]);
 
 	return (retval);