From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 14 Sep 2023 12:00:25 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qgj98-00EsEo-6S for lore@lore.pengutronix.de; Thu, 14 Sep 2023 12:00:25 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qgj95-00005I-Vc for lore@pengutronix.de; Thu, 14 Sep 2023 12:00:24 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=f/Tgqb3unBrkDRczIwW+GiZCFgyK+LgCCqH7zESIAoQ=; b=jzGThuwQZg/2yb+yx1Pj1QWIjx qzBRp6x4g64CdYw5SNN4WOR463IeGqh8wbvOZTsovBoZIOrtBPXY0G5ttvBMIrgpaivfMg1plp8uS idTzI6c+Pyo3GE+T0++65XqLaJq91JIiCzarlulxqn+4n98mn8ZHyThvhiIIb+x2hJZmW2NAyw2fE wzP5omEPXui+WA7e+tFtu02tIjonW/i0p/SrHhbpPLkxY/SBfzUKpanDwduocRhs55VROHWAXapL4 +aDRuvQM+xSdhE21/6QOUOtG7bFI2MrYNihi1PPUquf++jCPF/69kH7vDoPOiLN/j21FBrqOr+HrF 8c9LU/pA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qgj7r-007uCs-2q; Thu, 14 Sep 2023 09:59:07 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qgj7n-007uC0-00 for barebox@lists.infradead.org; Thu, 14 Sep 2023 09:59:04 +0000 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qgj7k-0007gj-A3 for barebox@lists.infradead.org; Thu, 14 Sep 2023 11:59:00 +0200 Received: from [2a0a:edc0:0:900:1d::45] (helo=ginster) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qgj7j-006Gv1-Ra for barebox@lists.infradead.org; Thu, 14 Sep 2023 11:58:59 +0200 Received: from jbe by ginster with local (Exim 4.94.2) (envelope-from ) id 1qgj7j-0005mL-Ik for barebox@lists.infradead.org; Thu, 14 Sep 2023 11:58:59 +0200 From: Juergen Borleis To: barebox@lists.infradead.org Date: Thu, 14 Sep 2023 11:58:59 +0200 Message-Id: <20230914095859.22166-2-jbe@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230914095859.22166-1-jbe@pengutronix.de> References: <20230914095859.22166-1-jbe@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230914_025903_041562_0B7B687C X-CRM114-Status: GOOD ( 16.92 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-3.8 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH 2/2] uncompress: add Android sparse image support X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.whiteo.stw.pengutronix.de) An Android sparse image file generated by the 'genimage' tool can be seen as a kind of compression, since it contains only the data which should really be written to a device. This implementation writes only the intended content and skips anything else. Signed-off-by: Juergen Borleis --- lib/uncompress.c | 82 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/lib/uncompress.c b/lib/uncompress.c index 0608e9f..f17e9ce 100644 --- a/lib/uncompress.c +++ b/lib/uncompress.c @@ -25,6 +25,10 @@ #include #include #include +#ifdef CONFIG_IMAGE_SPARSE +#include +#include +#endif static void *uncompress_buf; static unsigned int uncompress_size; @@ -60,6 +64,71 @@ static int uncompress_fill(void *buf, unsigned int len) return total; } +#ifdef CONFIG_IMAGE_SPARSE +static int uncompress_sparse(int source, int destination) +{ + int ret = 0; + struct sparse_image_ctx *sparse; + + /* rewind after checking the file type */ + lseek(source, 0, SEEK_SET); + + sparse = sparse_image_fd(source); + if (IS_ERR(sparse)) { + pr_err("Failed to open or interpret sparse image file: %m\n"); + ret = 1; + goto on_error_dev; + } + + const size_t transfer_buffer_length = SZ_128K; + unsigned char *buf = malloc(transfer_buffer_length); + if (!buf) { + pr_err("Failed to alloc memory for the transfers\n"); + ret = 1; + goto on_error_sparse; + } + + while (1) { + loff_t write_offset; + size_t write_length; + + int rc = sparse_image_read(sparse, buf, &write_offset, transfer_buffer_length, &write_length); + if (rc) { + ret = 1; + goto on_error_memory; + } + if (!write_length) + break; + + discard_range(destination, write_length, write_offset); + + write_offset = lseek(destination, write_offset, SEEK_SET); + if (write_offset == -1) { + pr_err("Failed to set next data's destination offset: %m\n"); + ret = 1; + goto on_error_memory; + + } + + rc = write_full(destination, buf, write_length); + if (rc < 0) { + pr_err("Failed to write destination's next data: %m\n"); + ret = 1; + goto on_error_memory; + } + } + +on_error_memory: + free(buf); +on_error_sparse: + free(sparse); /* Note: sparse_image_close(sparse); would also close the input file descriptor */ +on_error_dev: + return ret; +} +#endif + +static int uncompress_infd, uncompress_outfd; + int uncompress(unsigned char *inbuf, int len, int(*fill)(void*, unsigned int), int(*flush)(void*, unsigned int), @@ -121,6 +190,10 @@ int uncompress(unsigned char *inbuf, int len, case filetype_xz_compressed: compfn = decompress_unxz; break; +#endif +#ifdef CONFIG_IMAGE_SPARSE + case filetype_android_sparse: + break; #endif default: err = basprintf("cannot handle filetype %s", @@ -131,16 +204,17 @@ int uncompress(unsigned char *inbuf, int len, goto err; } - ret = compfn(inbuf, len, fill ? uncompress_fill : NULL, - flush, output, pos, error_fn); + if (ft == filetype_android_sparse) + ret = uncompress_sparse(uncompress_infd, uncompress_outfd); + else + ret = compfn(inbuf, len, fill ? uncompress_fill : NULL, + flush, output, pos, error_fn); err: free(uncompress_buf); return ret; } -static int uncompress_infd, uncompress_outfd; - static int fill_fd(void *buf, unsigned int len) { return read_full(uncompress_infd, buf, len); -- 2.30.2