diff mbox series

[U-Boot,V2,1/4] tools: imx8image: check lseek return value

Message ID 20181105100112.21490-1-peng.fan@nxp.com
State Accepted
Commit fc61cc2ca3bab8fdf38572eb1ccfa6674999c8b8
Delegated to: Stefano Babic
Headers show
Series [U-Boot,V2,1/4] tools: imx8image: check lseek return value | expand

Commit Message

Peng Fan Nov. 5, 2018, 9:53 a.m. UTC 
Check lseek return value.

Fix Coverity CID: 184236 184235 184232

Reported-by: Coverity
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---

V2: Per Fabio's comments, use ret = lseek; if (ret) < 0) coding style.

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

Comments

Fabio Estevam Nov. 5, 2018, 1:06 p.m. UTC | #1 
Hi Peng,

On Mon, Nov 5, 2018 at 7:53 AM Peng Fan <peng.fan@nxp.com> wrote:
>
> Check lseek return value.
>
> Fix Coverity CID: 184236 184235 184232
>
> Reported-by: Coverity
> Signed-off-by: Peng Fan <peng.fan@nxp.com>

Thanks for the respin.

Reviewed-by: Fabio Estevam <festevam@gmail.com>
Stefano Babic Nov. 6, 2018, 10:32 a.m. UTC | #2 
Hi Peng,

On 05/11/18 14:06, Fabio Estevam wrote:
> Hi Peng,
> 
> On Mon, Nov 5, 2018 at 7:53 AM Peng Fan <peng.fan@nxp.com> wrote:
>>
>> Check lseek return value.
>>
>> Fix Coverity CID: 184236 184235 184232
>>
>> Reported-by: Coverity
>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> 
> Thanks for the respin.
> 
> Reviewed-by: Fabio Estevam <festevam@gmail.com>
> 

Yes, thanks for this. I admit that I prefer in this way as Fabio, but I
admit that it is not thinkable that lseek() will change the API, and I
agree that change could be more or less a question of taste. Anyway, I
prefer in this way...

I merged the series together with:

- MAINTAINERS: add NXP linux team maillist as i.MX reviewer
- ARM: dts: fsl-imx8qxp-mek: Move regulator outside "simple-bus"
- mx8mq_evk: README: Delete file introduced by mistake

I do not see any other open points and I will send PR to Tom.

Best regards,
Stefano
diff mbox series

Patch

diff --git a/tools/imx8image.c b/tools/imx8image.c
index e6b0a146b6..03debe547e 100644
--- a/tools/imx8image.c
+++ b/tools/imx8image.c
@@ -301,6 +301,7 @@  static void copy_file_aligned(int ifd, const char *datafile, int offset,
 	unsigned char *ptr;
 	uint8_t zeros[0x4000];
 	int size;
+	int ret;
 
 	if (align > 0x4000) {
 		fprintf(stderr, "Wrong alignment requested %d\n", align);
@@ -333,7 +334,13 @@  static void copy_file_aligned(int ifd, const char *datafile, int offset,
 	}
 
 	size = sbuf.st_size;
-	lseek(ifd, offset, SEEK_SET);
+	ret = lseek(ifd, offset, SEEK_SET);
+	if (ret < 0) {
+		fprintf(stderr, "%s: lseek error %s\n",
+			__func__, strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
 	if (write(ifd, ptr, size) != size) {
 		fprintf(stderr, "Write error %s\n", strerror(errno));
 		exit(EXIT_FAILURE);
@@ -359,7 +366,7 @@  static void copy_file (int ifd, const char *datafile, int pad, int offset)
 	int tail;
 	int zero = 0;
 	uint8_t zeros[4096];
-	int size;
+	int size, ret;
 
 	memset(zeros, 0, sizeof(zeros));
 
@@ -387,7 +394,13 @@  static void copy_file (int ifd, const char *datafile, int pad, int offset)
 	}
 
 	size = sbuf.st_size;
-	lseek(ifd, offset, SEEK_SET);
+	ret = lseek(ifd, offset, SEEK_SET);
+	if (ret < 0) {
+		fprintf(stderr, "%s: lseek error %s\n",
+			__func__, strerror(errno));
+		exit(EXIT_FAILURE);
+	}
+
 	if (write(ifd, ptr, size) != size) {
 		fprintf(stderr, "Write error %s\n",
 			strerror(errno));
@@ -762,6 +775,7 @@  static int build_container(soc_type_t soc, uint32_t sector_size,
 	char *tmp_filename = NULL;
 	uint32_t size = 0;
 	uint32_t file_padding = 0;
+	int ret;
 
 	int container = -1;
 	int cont_img_count = 0; /* indexes to arrange the container */
@@ -883,7 +897,12 @@  static int build_container(soc_type_t soc, uint32_t sector_size,
 	} while (img_sp->option != NO_IMG);
 
 	/* Add padding or skip appended container */
-	lseek(ofd, file_padding, SEEK_SET);
+	ret = lseek(ofd, file_padding, SEEK_SET);
+	if (ret < 0) {
+		fprintf(stderr, "%s: lseek error %s\n",
+			__func__, strerror(errno));
+		exit(EXIT_FAILURE);
+	}
 
 	/* Note: Image offset are not contained in the image */
 	tmp = flatten_container_header(&imx_header, container + 1, &size,