The code flows through to the end of the function, so we don't need another close() before this. Remove it.

Reported-by: Coverity (CID: 138504)

Signed-off-by: Simon Glass sjg@chromium.org ---

tools/fit_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/fit_image.c b/tools/fit_image.c index 2c8d92f..31aa43c 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -530,6 +530,7 @@ static int fit_import_data(struct image_tool_params *params, const char *fname) if (fd < 0) { fprintf(stderr, "%s: Can't open %s: %s\n", params->cmdname, fname, strerror(errno)); + ret = -EIO; goto err; } if (write(fd, fdt, new_size) != new_size) { @@ -538,7 +539,6 @@ static int fit_import_data(struct image_tool_params *params, const char *fname) ret = -EIO; goto err; } - close(fd);

ret = 0;

One of these is causing a coverity warning. Drop these functions and use the standard U-Boot ones instead.

Reported-by: Coverity (CID: 138499)

Signed-off-by: Simon Glass sjg@chromium.org ---

disk/part_iso.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-)

diff --git a/disk/part_iso.c b/disk/part_iso.c index b83983b..2114faf 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -7,6 +7,7 @@

#include <common.h> #include <command.h> +#include <asm/unaligned.h> #include "part_iso.h"

#ifdef HAVE_BLOCK_DEVICE @@ -25,26 +26,6 @@

static unsigned char tmpbuf[CD_SECTSIZE];

-/* Convert char[4] in little endian format to the host format integer - */ -static inline unsigned long le32_to_int(unsigned char *le32) -{ - return ((le32[3] << 24) + - (le32[2] << 16) + - (le32[1] << 8) + - le32[0] - ); -} -/* Convert char[2] in little endian format to the host format integer - */ -static inline unsigned short le16_to_int(unsigned char *le16) -{ - return ((le16[1] << 8) + - le16[0] - ); -} - - /* only boot records will be listed as valid partitions */ int part_get_info_iso_verb(struct blk_desc *dev_desc, int part_num, disk_partition_t *info, int verb) @@ -103,7 +84,7 @@ int part_get_info_iso_verb(struct blk_desc *dev_desc, int part_num, pbr->ident_str, dev_desc->devnum, part_num); return (-1); } - bootaddr=le32_to_int(pbr->pointer); + bootaddr = get_unaligned_le32(pbr->pointer); PRINTF(" Boot Entry at: %08lX\n",bootaddr); if (blk_dread(dev_desc, bootaddr, 1, (ulong *)tmpbuf) != 1) { if(verb) @@ -203,7 +184,7 @@ found: } switch(pide->boot_media) { case 0x00: /* no emulation */ - info->size=le16_to_int(pide->sec_cnt)>>2; + info->size = get_unaligned_le16(pide->sec_cnt)>>2; break; case 0x01: info->size=2400>>2; break; /* 1.2MByte Floppy */ case 0x02: info->size=2880>>2; break; /* 1.44MByte Floppy */ @@ -211,7 +192,7 @@ found: case 0x04: info->size=2880>>2; break; /* dummy (HD Emulation) */ default: info->size=0; break; } - newblkaddr=le32_to_int(pide->rel_block_addr); + newblkaddr = get_unaligned_le32(pide->rel_block_addr); info->start=newblkaddr; PRINTF(" part %d found @ %lx size %lx\n",part_num,newblkaddr,info->size); return 0;

This cannot be NULL since part_get_info() calls this function and requires it to be non-NULL.

Reported-by: Coverity (CID: 138497)

Signed-off-by: Simon Glass sjg@chromium.org ---

disk/part_efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/disk/part_efi.c b/disk/part_efi.c index 93a7e81..fe308d7 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -240,7 +240,7 @@ int part_get_info_efi(struct blk_desc *dev_desc, int part, gpt_entry *gpt_pte = NULL;

/* "part" argument must be at least 1 */ - if (!dev_desc || !info || part < 1) { + if (part < 1) { printf("%s: Invalid Argument(s)\n", __func__); return -1; }

The space allocated to fdt is not freed on error. Fix it.

Reported-by: Coverity (CID: 138494)

Signed-off-by: Simon Glass sjg@chromium.org ---

tools/fit_image.c | 1 + 1 file changed, 1 insertion(+)

diff --git a/tools/fit_image.c b/tools/fit_image.c index 8a93ea3..8d58370 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -541,6 +541,7 @@ static int fit_import_data(struct image_tool_params *params, const char *fname) ret = 0;

err: + free(fdt); close(fd); return ret; }

The 'buf' variable is not freed. Fix it.

Reported-by: Coverity (CID: 138492) Signed-off-by: Simon Glass sjg@chromium.org ---

tools/fit_image.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/tools/fit_image.c b/tools/fit_image.c index bfb43b2..e628212 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -452,6 +452,8 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname) err_munmap: munmap(fdt, sbuf.st_size); err: + if (buf) + free(buf); close(fd); return ret; }

The file that is opened is not closed in all cases. Fix it.

Reported-by: Coverity (CID: 138490) Signed-off-by: Simon Glass sjg@chromium.org ---

tools/fit_image.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/fit_image.c b/tools/fit_image.c index 9d553d1..6e5c143 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -123,13 +123,14 @@ static int fdt_property_file(struct image_tool_params *params,

ret = fdt_property_placeholder(fdt, "data", sbuf.st_size, &ptr); if (ret) - return ret; + goto err; ret = read(fd, ptr, sbuf.st_size); if (ret != sbuf.st_size) { fprintf(stderr, "%s: Can't read %s: %s\n", params->cmdname, fname, strerror(errno)); goto err; } + close(fd);

return 0; err:

This should return 0 on success, not 1. Fix it.

Signed-off-by: Simon Glass sjg@chromium.org ---

common/usb_storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/usb_storage.c b/common/usb_storage.c index 1472824..18fdf73 100644 --- a/common/usb_storage.c +++ b/common/usb_storage.c @@ -193,7 +193,7 @@ int usb_stor_info(void) return 1; }

- return 1; + return 0; }

static unsigned int usb_get_max_lun(struct us_data *us)