From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1Zqprl-0001aQ-BW for mharc-grub-devel@gnu.org; Mon, 26 Oct 2015 18:03:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqpri-0001Z7-NE for grub-devel@gnu.org; Mon, 26 Oct 2015 18:03:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zqprh-0004lk-OJ for grub-devel@gnu.org; Mon, 26 Oct 2015 18:03:42 -0400 Received: from mail-wi0-x22e.google.com ([2a00:1450:400c:c05::22e]:36070) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqprh-0004lR-Ik for grub-devel@gnu.org; Mon, 26 Oct 2015 18:03:41 -0400 Received: by wicfx6 with SMTP id fx6so134195454wic.1 for ; Mon, 26 Oct 2015 15:03:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-type; bh=/tlRfHSF8dB0+ZaSW4aGecwZq5d2RTEbjg8EFj/PZis=; b=TY2U5by9cPfohgKfovGYchwQ8W3w4/TY/4LgOymkuZ9ntUPnYFfXc7535T/KkzFsAb U0EANe8Jd95jBL8hrop4yFqTEFh2Z9JB2CscnRNzix3JzGy9VlamEAJmQPdrrx6wcFHG +vV3PoQOvegKHZ46EyCirp7WXs1ak7wHOKK/R5YTInMBHEb6uw8pHvLj8CXHKp4sEHYY njw2x0+dhiIfvEmhelUXK73XDPPIp1+pBgJQhxneAYpU5Js08QOZWzyYrvhfXnnj7j7k 2MwhpGkzNWRkQ3cYq8tC00N84Yt1WJ+Ddc3HJ5NqV1gDT6Je2s1l2R+/lvWlBP1ArOjg EQ6g== X-Received: by 10.180.160.229 with SMTP id xn5mr23839000wib.54.1445897020978; Mon, 26 Oct 2015 15:03:40 -0700 (PDT) Received: from ?IPv6:2a02:1205:34c8:dc00:863a:4bff:fe50:abc4? ([2a02:1205:34c8:dc00:863a:4bff:fe50:abc4]) by smtp.gmail.com with ESMTPSA id ka10sm41336433wjc.30.2015.10.26.15.03.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Oct 2015 15:03:40 -0700 (PDT) Subject: Re: [PATCH 1/3] ieee1275: ofdisk dangling pointer To: The development of GNU GRUB References: <1671671c705298f7d6e8c7e79805564b3b662548.1445895272.git.eric.snowberg@oracle.com> From: =?UTF-8?Q?Vladimir_'=cf=86-coder/phcoder'_Serbinenko?= Message-ID: <562EA33B.4030103@gmail.com> Date: Mon, 26 Oct 2015 23:03:39 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Icedove/38.2.0 MIME-Version: 1.0 In-Reply-To: <1671671c705298f7d6e8c7e79805564b3b662548.1445895272.git.eric.snowberg@oracle.com> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="8CvpLHesDrtMJMbo6OKhvD7eQSBdfPdjo" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22e 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 22:03:43 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --8CvpLHesDrtMJMbo6OKhvD7eQSBdfPdjo Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 26.10.2015 22:43, Eric Snowberg wrote: > Within commit: 87ec3b7fa9061f470616ed927fc140e995831c00 - > "Don't continue to query block-size if disk doesn't have it.=E2=80=9D > a dangling pointer was introduced. >=20 > Fix dangling pointer issue in grub_ofdisk_open where devpath is freed > and then used again within the call to grub_ofdisk_get_block_size. This= > solves many memory corruption issues we were seeing. >=20 Committed, thanks > Signed-off-by: Eric Snowberg > --- > grub-core/disk/ieee1275/ofdisk.c | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) >=20 > diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275= /ofdisk.c > index 331769b..4a5632c 100644 > --- a/grub-core/disk/ieee1275/ofdisk.c > +++ b/grub-core/disk/ieee1275/ofdisk.c > @@ -422,10 +422,11 @@ grub_ofdisk_open (const char *name, grub_disk_t d= isk) > op =3D ofdisk_hash_find (devpath); > if (!op) > op =3D ofdisk_hash_add (devpath, NULL); > - else > - grub_free (devpath); > if (!op) > - return grub_errno; > + { > + grub_free (devpath); > + return grub_errno; > + } > disk->id =3D (unsigned long) op; > disk->data =3D op->open_path; > =20 >=20 --8CvpLHesDrtMJMbo6OKhvD7eQSBdfPdjo Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iF4EAREKAAYFAlYuozsACgkQmBXlbbo5nOsziAD+KX78XjHk841YG+jUEGVSylbE maEu8m3chAz6BiraFyEBAKweXq8s5FBr95FjX193AGhdfC5t+e0ywQoTcsBrZE9g =OeDA -----END PGP SIGNATURE----- --8CvpLHesDrtMJMbo6OKhvD7eQSBdfPdjo--