File U-Boot-image.c-Fix-non-Android-booting-with-ram... of Package u-boot

Overview Repositories Revisions Requests Users Attributes Meta

File U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch of Package u-boot (Revision ccc3d54f63682cb9e6254e8bc9a33813)

Currently displaying revision ccc3d54f63682cb9e6254e8bc9a33813 , Show latest

From patchwork Tue Oct 27 23:06:43 2015
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [U-Boot] image.c: Fix non-Android booting with ramdisk and/or device
 tree
From: Tom Rini <trini@konsulko.com>
X-Patchwork-Id: 537133
Message-Id: <1445987203-23097-1-git-send-email-trini@konsulko.com>
To: u-boot@lists.denx.de
Date: Tue, 27 Oct 2015 19:06:43 -0400

In 1fec3c5 I added a check that if we had an Android image we default to
trying the kernel address for a ramdisk.  However when we don't have an
Android image buf is NULL and we oops here.  Ensure that we have 'buf'
to check first.

Reported-by: elipe Balbi <balbi@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 common/image.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/image.c b/common/image.c
index e607109..85c4f39 100644
--- a/common/image.c
+++ b/common/image.c
@@ -913,7 +913,7 @@ int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
 	 * Look for an Android boot image.
 	 */
 	buf = map_sysmem(images->os.start, 0);
-	if (genimg_get_format(buf) == IMAGE_FORMAT_ANDROID)
+	if (buf && genimg_get_format(buf) == IMAGE_FORMAT_ANDROID)
 		select = argv[0];
 #endif

Places

File U-Boot-image.c-Fix-non-Android-booting-with-ramdisk-and-or-device-tree.patch of Package u-boot (Revision ccc3d54f63682cb9e6254e8bc9a33813)

Places