From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kyuUg-0007pm-Jc for barebox@lists.infradead.org; Mon, 11 Jan 2021 10:32:15 +0000 From: Steffen Trumtrar Date: Mon, 11 Jan 2021 11:32:04 +0100 Message-Id: <20210111103205.4330-1-s.trumtrar@pengutronix.de> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 1/2] image-sparse: change retlen to size_t To: barebox@lists.infradead.org Cc: Steffen Trumtrar retlen can potentially overflow. Also, write_full() in fastboot_handle_sparse() expects size_t anyway. Signed-off-by: Steffen Trumtrar --- common/fastboot.c | 2 +- include/image-sparse.h | 2 +- lib/image-sparse.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/fastboot.c b/common/fastboot.c index 1b6dc28d8e..40b92d9982 100644 --- a/common/fastboot.c +++ b/common/fastboot.c @@ -566,7 +566,7 @@ static int fastboot_handle_sparse(struct fastboot *fb, } while (1) { - int retlen; + size_t retlen; loff_t pos; ret = sparse_image_read(sparse, buf, &pos, bufsiz, &retlen); diff --git a/include/image-sparse.h b/include/image-sparse.h index 29242f4fd5..6bff844411 100644 --- a/include/image-sparse.h +++ b/include/image-sparse.h @@ -60,7 +60,7 @@ struct sparse_image_ctx; struct sparse_image_ctx *sparse_image_open(const char *path); int sparse_image_read(struct sparse_image_ctx *si, void *buf, - loff_t *pos, size_t len, int *retlen); + loff_t *pos, size_t len, size_t *retlen); void sparse_image_close(struct sparse_image_ctx *si); loff_t sparse_image_size(struct sparse_image_ctx *si); diff --git a/lib/image-sparse.c b/lib/image-sparse.c index 0c31742ab6..8e7a52fd71 100644 --- a/lib/image-sparse.c +++ b/lib/image-sparse.c @@ -190,7 +190,7 @@ out: } int sparse_image_read(struct sparse_image_ctx *si, void *buf, loff_t *pos, - size_t len, int *retlen) + size_t len, size_t *retlen) { size_t now; int ret, i; -- 2.20.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox