From 988f780aa5fbee872018036b2b7aa910240ae373 Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 7 Aug 2010 12:49:52 +0000 Subject: [PATCH] loaders: fix open_ih return value checks open_ih() returns -1 on error and 0 is a valid return value. Signed-off-by: Blue Swirl git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@839 f158a5a8-5612-0410-a976-696ce0be7e32 --- libopenbios/aout_load.c | 3 ++- libopenbios/elf_load.c | 3 ++- libopenbios/fcode_load.c | 3 ++- libopenbios/forth_load.c | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libopenbios/aout_load.c b/libopenbios/aout_load.c index d421c9d..6b2d924 100644 --- a/libopenbios/aout_load.c +++ b/libopenbios/aout_load.c @@ -81,8 +81,9 @@ aout_load(struct sys_info *info, ihandle_t dev) feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } for (offset = 0; offset < 16 * 512; offset += 512) { seek_io(fd, offset); diff --git a/libopenbios/elf_load.c b/libopenbios/elf_load.c index 77a9753..4ea08a7 100644 --- a/libopenbios/elf_load.c +++ b/libopenbios/elf_load.c @@ -383,8 +383,9 @@ elf_load(struct sys_info *info, ihandle_t dev, const char *cmdline, void **boot_ feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } offset = find_elf(&ehdr); if (!offset) { diff --git a/libopenbios/fcode_load.c b/libopenbios/fcode_load.c index 9e582b2..1d60805 100644 --- a/libopenbios/fcode_load.c +++ b/libopenbios/fcode_load.c @@ -35,8 +35,9 @@ fcode_load(ihandle_t dev) feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } for (offset = 0; offset < 16 * 512; offset += 512) { seek_io(fd, offset); diff --git a/libopenbios/forth_load.c b/libopenbios/forth_load.c index d3b911d..c3a1929 100644 --- a/libopenbios/forth_load.c +++ b/libopenbios/forth_load.c @@ -33,8 +33,9 @@ int forth_load(ihandle_t dev) feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } if (read_io(fd, magic, 2) != 2) { debug("Can't read magic header\n");