From patchwork Tue Apr 30 12:43:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Glembotzki X-Patchwork-Id: 1929495 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=HyO8TpCN; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=kiXXc8KB; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23d; helo=mail-lj1-x23d.google.com; envelope-from=swupdate+bncbdy5juxlviebbiopyoyqmgqe4rzfa4a@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x23d.google.com (mail-lj1-x23d.google.com [IPv6:2a00:1450:4864:20::23d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VTKdg2mbGz23ny for ; Tue, 30 Apr 2024 22:44:23 +1000 (AEST) Received: by mail-lj1-x23d.google.com with SMTP id 38308e7fff4ca-2db099e687fsf47792911fa.1 for ; Tue, 30 Apr 2024 05:44:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714481058; cv=pass; d=google.com; s=arc-20160816; b=H/U0a1QggByDqB+7vWVs17RfsirQhmsmKbLaD2L++VsRgDwWBySJ3EJw1TycLQ1bSq Lh5+idJ9Iarqb4sbfPhUmeeGWN1QXx8id/UkYMCAPxjJyE0AP2aO21+Rzhnmqzauc4T+ qgRDtyp7LhV2xB/e15Tcrx/fSpnpnuOd4mNJAgG870z3hOdTJzLgoZjNjdBO0bbAFDsx qnbyA4T7+QeFvldBoW3VTnmODnME5WkoUv1TOS0bTxOkuIUvNWOKZ+SoOnZrin6L/3aV 1kVHyFsAUkrJKnYLpS++Wpfi5M7erq+OkhMtqIOJmBcy8+PsIRYjxNjQvAQ/NAROhKz2 Scdg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature :dkim-signature; bh=CKmgZTL3E7qFXhxziOvb4BIdRfTcugpvq70XwmvjxWk=; fh=WiV/DuhyjPS0GOgrfuPbD/Sd56Ap8rHAX6IOzcviwaI=; b=u92HDoSGqQvCk1fEGWu4HzTUtyDss008e8bZjn+Vi7tVhVflHLAYCWVv0Prxirz+bR g0OL0VVseqyXRvOrRQrjm1YQIfgGEgfuNepWYhm1ADmndC0NcHIVTCJQ81HtnHuXB5EA fpoVc4NvvramNVjo+hmhEp3gGRRsvT6umklo3rZ6blHDXXa5ZYkGkaGprASmopqA4Osk J7ufn8Aw8kW+hGHlrtcxNqbQI0FggcB58XhobdgWvNj8THjJcpAG+C/G2HZGtc3DOLrG sAnfCRyhuVhRSdUP7KEgOpLqAoo7yALt/8jrNa3in2VY2lukytweBSnzTQiaCfPtza7f vbxQ==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SSF0jKZg; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::535 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1714481058; x=1715085858; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=CKmgZTL3E7qFXhxziOvb4BIdRfTcugpvq70XwmvjxWk=; b=HyO8TpCNcdrugm4njwFf+DsHltI1U30CgMVHJhPO58PveeFouv0v1jp97Aay+NMgzT pFeiLT5P6TESEKSwRZUEcUvi39c8WT7wJ24b5J78Vlr1D1Uk8IoFuIZ0sh2B83YiQh7/ nGrR1XCAAVxTm0X4BuPTYtE4mc7ehXovc2VuHsdsU2ABErpGCOliWCaKZmKJmNdVGICV zgZv0SljzvspX0OxRlu9j50On8JKA1IETrMoFBShf1NZqwR3IFZvvsxXPxqzhLuA6DB1 gvet0drY1desiE7M15oHNVVBSdoiMBk+yIALqTo79MnJuiXEo6bEdOCBbTvhhFfZkGh2 8d2g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714481058; x=1715085858; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=CKmgZTL3E7qFXhxziOvb4BIdRfTcugpvq70XwmvjxWk=; b=kiXXc8KBJL40p/7ZyoM4y7wovbCeIwgE79/mHDoJ64+OLlotWnj7sIVlsEnV20DbeS iB+PIDmlyFxzTulZNDYM2Z2/TYHVZWKClV16gmOkHssHT6gvtAv4moneduGKXxITvpjE FOA3kqZYb5w+wzfCbRi5/7E+9Zu747iG7yROzRS3H5Vx1GdrV3sM4vqcRi5mjr5Qb5m5 TV+WFsFwvvsziAWIXaHSWB1iPqIVVhUrPmhUbu05qY8X/9TXEzLqnoU7HbakQlPd2vlY flLp0x9dbYlcfXGDU3nneEWOfnAuj4ulDsNXun9sJwgIeDCZqjw7sM6y2S6Qu/z4CXgZ XRlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714481058; x=1715085858; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=CKmgZTL3E7qFXhxziOvb4BIdRfTcugpvq70XwmvjxWk=; b=s1UEFEpSrqxj4+KVovyVL7oAsuJpm8hgkHLp/381OHpqQ8btap9LUxuWR+t3ug8dmR /ar6BACQWkiOyzF980ROQQKEYxWw4avqc1DqQz9RgXibGhm+oY3uP6guBw3fKFrVsSKJ 7tlkGLvs9RbLkRjV2W34Ok6uyH4wvoLi0fyyiO6webU68vzuegQRlQC+ZlwZmZVuIR7F 7u/A645J+dKV7Q9OD6O3SwqHWQN2Cbr1RJAB2plqQD2ivym848SWk4vzeMKCBiai/CoD C/KXPwaZ9P+dY2K3uCiE+qvVFSlHYsIiGGOjYKdQXWBdK9q7kRSZjvSY8YA7mk0O9UQB 8Kmg== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCU22+oydQeTB0QEuTPgO1sHzsIwRK2+eEcCPHQfkNI3MOefwmjz+Gu9zV8/uZRC+EiFYLzCZi9m69Sl9yLVE0dGuRYFeZyG2zbKDu9uSg== X-Gm-Message-State: AOJu0YxTDJ/vt/cC40pJE3wRsNtPnCkaiQTraqBgLVp594AA7rEvkyn9 DcvAEKvbaOLb9njYwU9A8DGVPcJBrVJo6ldScqA3qWmSmU/F33YP X-Google-Smtp-Source: AGHT+IG3QWWxH+wL1YFu35sgqC0vqU5tYhMzelJurEO2JCsbD0ZGOouodTrrFW+sMKRAcHyn2FZmDA== X-Received: by 2002:a2e:b6d0:0:b0:2e0:efe5:4cda with SMTP id m16-20020a2eb6d0000000b002e0efe54cdamr1423766ljo.36.1714481058355; Tue, 30 Apr 2024 05:44:18 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a5d:6a86:0:b0:34d:8c0a:9169 with SMTP id ffacd0b85a97d-34d8c0a975els203973f8f.2.-pod-prod-02-eu; Tue, 30 Apr 2024 05:44:15 -0700 (PDT) X-Received: by 2002:adf:b195:0:b0:34d:7fbb:e15b with SMTP id q21-20020adfb195000000b0034d7fbbe15bmr1253460wra.27.1714481055398; Tue, 30 Apr 2024 05:44:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714481055; cv=none; d=google.com; s=arc-20160816; b=PQ/xVnKt9bMxwH0oVNWNPLNeBD5vgN4mDLuq9/Ct2s6tmtFU/4i7FbEhs9hmJS6MBT aIwBoMkKpezrxQiF5vYq6AMZof89dEC+q13IpC5xha219vUnjoSJCK2H2KW7Cn9x6r7l g5xacg1pjkiOE4MxfsvQfS9toQTD3Ux1Y+CE2g6dHLCzg5hM65KIKOrwTo61SMd0TTGZ aaV38RI+nGjfzkIMtBrSbG2RJe3r0bxSMldeQ/ivM+W5Yzv2RCLo505DZYik/47kOj1m mWJwgApT9erI3xCDr7nLsRRYYkqxXw+YA674QH+5nUK0kWMmPUtCAg9hn2H1+adxmudk NPFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=8DTxCXSyvMU6qKstuBDWNz3FOwZ9u/0AEc5Amsm6cGI=; fh=zydHuzCQWrku2OPQyZfraJZFcOpEXLQ/YBcu3QNiBd0=; b=w1SOUbMfV5X0v2ERTwh6Fp7hNehQ6QunVCo6LGL7WL1esm2ugo14NlaXdoL6GmZFC7 YV1lMuYihVBIuupgC8lfNGOquvuczzHtC2rMF/VtadcOJ2fb52po4mD7xTOPnWzg9pkd rj1f6NJawsN2riBNcUwV8MpcBMMOF2kl5D2h5/E6Pdnae4FRfOxQG7lirjr4Gn5vRRqz liNyYlG69DmOUcgbDMAxZJ2Z6MiFN1krtde45ePQENdfJrceyXSbSxKZYiwvHhGgooi4 VlgtFYBLs1ZGIopUFABcVawmwiN5/7h8/PmV1bcNP2q2TyRh6VeObwCqdvrjc/r6i8VU Ym+w==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SSF0jKZg; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::535 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com. [2a00:1450:4864:20::535]) by gmr-mx.google.com with ESMTPS id cw18-20020a056000091200b00347a3498f11si965065wrb.5.2024.04.30.05.44.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Apr 2024 05:44:15 -0700 (PDT) Received-SPF: pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::535 as permitted sender) client-ip=2a00:1450:4864:20::535; Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5727dc6d3edso2774569a12.0 for ; Tue, 30 Apr 2024 05:44:15 -0700 (PDT) X-Received: by 2002:a50:cd9e:0:b0:572:6846:b899 with SMTP id p30-20020a50cd9e000000b005726846b899mr1864460edi.41.1714481054260; Tue, 30 Apr 2024 05:44:14 -0700 (PDT) Received: from localhost.localdomain ([2a02:8108:96c0:76fc::3f69]) by smtp.gmail.com with ESMTPSA id a101-20020a509eee000000b00572459a4ffesm5869281edf.56.2024.04.30.05.44.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Apr 2024 05:44:13 -0700 (PDT) From: Michael Glembotzki To: swupdate@googlegroups.com Cc: Michael Glembotzki Subject: [swupdate] [PATCH 3/3] cpiohdr: Expose fill_buffer in header for external use Date: Tue, 30 Apr 2024 14:43:16 +0200 Message-ID: <20240430124316.1714467-3-Michael.Glembotzki@iris-sensing.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240430124316.1714467-1-Michael.Glembotzki@iris-sensing.com> References: <20240430124316.1714467-1-Michael.Glembotzki@iris-sensing.com> MIME-Version: 1.0 X-Original-Sender: m.glembo@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=SSF0jKZg; spf=pass (google.com: domain of m.glembo@gmail.com designates 2a00:1450:4864:20::535 as permitted sender) smtp.mailfrom=m.glembo@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Signed-off-by: Michael Glembotzki Reviewed-by: Stefano Babic --- core/cpio_utils.c | 19 +++++++++++++------ include/cpiohdr.h | 1 + 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/core/cpio_utils.c b/core/cpio_utils.c index 87847981..00b15f03 100644 --- a/core/cpio_utils.c +++ b/core/cpio_utils.c @@ -59,7 +59,7 @@ int get_cpiohdr(unsigned char *buf, struct filehdr *fhdr) return 0; } -static int fill_buffer(int fd, unsigned char *buf, unsigned int nbytes, unsigned long *offs, +static int _fill_buffer(int fd, unsigned char *buf, unsigned int nbytes, unsigned long *offs, uint32_t *checksum, void *dgst) { ssize_t len; @@ -92,6 +92,13 @@ static int fill_buffer(int fd, unsigned char *buf, unsigned int nbytes, unsigned return count; } + +int fill_buffer(int fd, unsigned char *buf, unsigned int nbytes) +{ + unsigned long offs = 0; + return _fill_buffer(fd, buf, nbytes, &offs, NULL, NULL); +} + /* * Read padding that could exists between the cpio trailer and the end-of-file. * cpio aligns the file to 512 bytes @@ -235,7 +242,7 @@ static int input_step(void *state, void *buffer, size_t size) } switch (s->source) { case INPUT_FROM_FD: - ret = fill_buffer(s->fdin, buffer, size, s->offs, &s->checksum, s->dgst); + ret = _fill_buffer(s->fdin, buffer, size, s->offs, &s->checksum, s->dgst); if (ret < 0) { return ret; } @@ -669,7 +676,7 @@ static int __swupdate_copy(int fdin, unsigned char *inbuf, void *out, size_t nby } if (!inbuf) { - ret = fill_buffer(fdin, buffer, NPAD_BYTES(*offs), offs, checksum, NULL); + ret = _fill_buffer(fdin, buffer, NPAD_BYTES(*offs), offs, checksum, NULL); if (ret < 0) DEBUG("Padding bytes are not read, ignoring"); } @@ -757,7 +764,7 @@ int copyimage(void *out, struct img_type *img, writeimage callback) int extract_cpio_header(int fd, struct filehdr *fhdr, unsigned long *offset) { unsigned char buf[sizeof(fhdr->filename)]; - if (fill_buffer(fd, buf, sizeof(struct new_ascii_header), offset, NULL, NULL) < 0) + if (_fill_buffer(fd, buf, sizeof(struct new_ascii_header), offset, NULL, NULL) < 0) return -EINVAL; if (get_cpiohdr(buf, fhdr) < 0) { ERROR("CPIO Header corrupted, cannot be parsed"); @@ -771,13 +778,13 @@ int extract_cpio_header(int fd, struct filehdr *fhdr, unsigned long *offset) return -EINVAL; } - if (fill_buffer(fd, buf, fhdr->namesize , offset, NULL, NULL) < 0) + if (_fill_buffer(fd, buf, fhdr->namesize , offset, NULL, NULL) < 0) return -EINVAL; buf[fhdr->namesize] = '\0'; strlcpy(fhdr->filename, (char *)buf, sizeof(fhdr->filename)); /* Skip filename padding, if any */ - if (fill_buffer(fd, buf, (4 - (*offset % 4)) % 4, offset, NULL, NULL) < 0) + if (_fill_buffer(fd, buf, (4 - (*offset % 4)) % 4, offset, NULL, NULL) < 0) return -EINVAL; return 0; diff --git a/include/cpiohdr.h b/include/cpiohdr.h index b694de5e..18107c17 100644 --- a/include/cpiohdr.h +++ b/include/cpiohdr.h @@ -62,3 +62,4 @@ int extract_cpio_header(int fd, struct filehdr *fhdr, unsigned long *offset); int extract_img_from_cpio(int fd, unsigned long offset, struct filehdr *fdh); void extract_padding(int fd); bool swupdate_verify_chksum(const uint32_t chk1, struct filehdr *fhdr); +int fill_buffer(int fd, unsigned char *buf, unsigned int nbytes);