From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZqpYa-0003gX-BK for mharc-grub-devel@gnu.org; Mon, 26 Oct 2015 17:43:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqpYW-0003cC-98 for grub-devel@gnu.org; Mon, 26 Oct 2015 17:43:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZqpYR-0001fW-Le for grub-devel@gnu.org; Mon, 26 Oct 2015 17:43:52 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:45144) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqpYR-0001f1-Ep for grub-devel@gnu.org; Mon, 26 Oct 2015 17:43:47 -0400 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t9QLhkoH025780 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 26 Oct 2015 21:43:46 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t9QLhkPw010561 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Mon, 26 Oct 2015 21:43:46 GMT Received: from abhmp0017.oracle.com (abhmp0017.oracle.com [141.146.116.23]) by userv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t9QLhjLJ014414 for ; Mon, 26 Oct 2015 21:43:45 GMT Received: from ca-qasparc20.us.oracle.com (/10.147.24.73) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 26 Oct 2015 14:43:45 -0700 From: Eric Snowberg To: grub-devel@gnu.org Subject: [PATCH 2/3] ieee1275: ofdisk memory leak Date: Mon, 26 Oct 2015 17:43:37 -0400 Message-Id: <47d14c14670ca8604c76e157f66251ba70bc91f2.1445895272.git.eric.snowberg@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1671671c705298f7d6e8c7e79805564b3b662548.1445895272.git.eric.snowberg@oracle.com> References: <1671671c705298f7d6e8c7e79805564b3b662548.1445895272.git.eric.snowberg@oracle.com> In-Reply-To: <1671671c705298f7d6e8c7e79805564b3b662548.1445895272.git.eric.snowberg@oracle.com> References: <1671671c705298f7d6e8c7e79805564b3b662548.1445895272.git.eric.snowberg@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 To: eric.snowberg@oracle.com X-Source-IP: userv0021.oracle.com [156.151.31.71] Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by aserp1040.oracle.com id t9QLhkoH025780 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 141.146.126.69 Cc: Eric Snowberg X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Oct 2015 21:43:53 -0000 Fix memory leak added within commit: 87ec3b7fa9061f470616ed927fc140e995831c00 - "Don't continue to query block-size if disk doesn't have it.=E2=80=9D Signed-off-by: Eric Snowberg --- grub-core/disk/ieee1275/ofdisk.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/o= fdisk.c index 4a5632c..297f058 100644 --- a/grub-core/disk/ieee1275/ofdisk.c +++ b/grub-core/disk/ieee1275/ofdisk.c @@ -432,7 +432,10 @@ grub_ofdisk_open (const char *name, grub_disk_t disk= ) =20 err =3D grub_ofdisk_get_block_size (devpath, &block_size, op); if (err) - return err; + { + grub_free (devpath); + return err; + } if (block_size !=3D 0) { for (disk->log_sector_size =3D 0; @@ -443,6 +446,7 @@ grub_ofdisk_open (const char *name, grub_disk_t disk) disk->log_sector_size =3D 9; } =20 + grub_free (devpath); return 0; } =20 --=20 1.7.1