From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 22D2EC433F5 for ; Tue, 8 Mar 2022 13:42:22 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6F62E83915; Tue, 8 Mar 2022 14:42:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=konsulko.com header.i=@konsulko.com header.b="J3CXZFm2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 654DD83984; Tue, 8 Mar 2022 14:42:15 +0100 (CET) Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 14CA483915 for ; Tue, 8 Mar 2022 14:42:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=trini@konsulko.com Received: by mail-qt1-x82b.google.com with SMTP id 11so16076294qtt.9 for ; Tue, 08 Mar 2022 05:42:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=konsulko.com; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ChJ//U4CIq0I2MKLga1JueML2d7t7KuVC8uuRuaWfxo=; b=J3CXZFm2M4d0p3kXAPfgRz2VjJ5Uww3bd2UD0FzjSGvcTWouLzRMmYP0YVsklciPxC uQ/WG4pukJVgkPIwXT1mWH4uCvyDIuZMzAriiLwDsqa0nG4paTuDVv0iRAQnmpn1VnDK s0GomyLYknQfpj+hvQxkdMrXTn2Z2v0sxbWJQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ChJ//U4CIq0I2MKLga1JueML2d7t7KuVC8uuRuaWfxo=; b=Sr2ZnUONWVeVSFKq0QHawFfV0ceSAr1qGVpoMXu74jbtOc2EusJsCkvWVCbOEL9du6 RgfPQb1BI0O7AZStzk0zS5GAoH41jQtzknoYYPb5Rl/K+GszGSXYSTOiMwFY3PX6nFoX GFviSq3Vsc5a2tEEEx+6L/+hmcjZVQiW/Syc+OzTJCUNhUjUeBYFAQzAh6lwvfOLm7lG 3MuW724gO6fqUQlhO2Hu/gM9psdXHRqW0zWbtcEb/Mu2CLiUib5lQsbWpgcEofqehBNx +wFpi7g7CiZ2PUWgOUakLsuawK4RETbxZ2MK4nmkAqbr/UzOGvZz3DvIKwtho5Xm6/Pn mRfA== X-Gm-Message-State: AOAM530i7uqlkzolit3zzTxerOqcs9VNBg8zvT9qByTlXNujYHzJ5dcK RQdEjEbGz7x3wRTxXGSKhWiCQw== X-Google-Smtp-Source: ABdhPJwOxf1BqDKlWSuwU1TBflWD35B1YvNCS7+pbilSHA8XZqHcGtDdV5p1ARBSurSARCmFFiA+fg== X-Received: by 2002:a05:622a:15cf:b0:2de:8dc8:6d5a with SMTP id d15-20020a05622a15cf00b002de8dc86d5amr13838620qty.14.1646746929776; Tue, 08 Mar 2022 05:42:09 -0800 (PST) Received: from bill-the-cat (2603-6081-7b01-cbda-2ef0-5dff-fedb-a8ba.res6.spectrum.com. [2603:6081:7b01:cbda:2ef0:5dff:fedb:a8ba]) by smtp.gmail.com with ESMTPSA id m10-20020a05622a054a00b002e049ff99f2sm9524873qtx.7.2022.03.08.05.42.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Mar 2022 05:42:08 -0800 (PST) Date: Tue, 8 Mar 2022 08:42:06 -0500 From: Tom Rini To: Pali =?iso-8859-1?Q?Roh=E1r?= , Joseph Chen Cc: Simon Glass , Alexandru Gagniuc , Yann Dirson , Stefan Roese , Marek =?iso-8859-1?Q?Beh=FAn?= , u-boot@lists.denx.de Subject: Re: [PATCH v2] tools: mkimage: Call verify_header after writing image to disk Message-ID: <20220308134206.GN5020@bill-the-cat> References: <20220114173443.9877-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="1MaLZ7+w12+PvFyj" Content-Disposition: inline In-Reply-To: <20220114173443.9877-1-pali@kernel.org> X-Clacks-Overhead: GNU Terry Pratchett X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean --1MaLZ7+w12+PvFyj Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 14, 2022 at 06:34:43PM +0100, Pali Roh=E1r wrote: > If image backend provides verify_header callback then call it after writi= ng > image to disk. This ensures that written image is correct. >=20 > Signed-off-by: Pali Roh=E1r > Reviewed-by: Stefan Roese > Reviewed-by: Simon Glass > --- > tools/mkimage.c | 41 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 41 insertions(+) >=20 > diff --git a/tools/mkimage.c b/tools/mkimage.c > index fbe883ce3620..d5ad0925225c 100644 > --- a/tools/mkimage.c > +++ b/tools/mkimage.c > @@ -336,6 +336,44 @@ static void process_args(int argc, char **argv) > usage("Missing output filename"); > } > =20 > +static void verify_image(const struct image_type_params *tparams) > +{ > + struct stat sbuf; > + void *ptr; > + int ifd; > + > + ifd =3D open(params.imagefile, O_RDONLY | O_BINARY); > + if (ifd < 0) { > + fprintf(stderr, "%s: Can't open %s: %s\n", > + params.cmdname, params.imagefile, > + strerror(errno)); > + exit(EXIT_FAILURE); > + } > + > + if (fstat(ifd, &sbuf) < 0) { > + fprintf(stderr, "%s: Can't stat %s: %s\n", > + params.cmdname, params.imagefile, strerror(errno)); > + exit(EXIT_FAILURE); > + } > + params.file_size =3D sbuf.st_size; > + > + ptr =3D mmap(0, params.file_size, PROT_READ, MAP_SHARED, ifd, 0); > + if (ptr =3D=3D MAP_FAILED) { > + fprintf(stderr, "%s: Can't map %s: %s\n", > + params.cmdname, params.imagefile, strerror(errno)); > + exit(EXIT_FAILURE); > + } > + > + if (tparams->verify_header((unsigned char *)ptr, params.file_size, &par= ams) !=3D 0) { > + fprintf(stderr, "%s: Failed to verify header of %s\n", > + params.cmdname, params.imagefile); > + exit(EXIT_FAILURE); > + } > + > + (void)munmap(ptr, params.file_size); > + (void)close(ifd); > +} > + > int main(int argc, char **argv) > { > int ifd =3D -1; > @@ -698,6 +736,9 @@ int main(int argc, char **argv) > exit (EXIT_FAILURE); > } > =20 > + if (tparams->verify_header) > + verify_image(tparams); > + > exit (EXIT_SUCCESS); > } I've added Joseph Chen to the thread as with this patch applied, evb-rk3568 fails to build now with: =2E/tools/mkimage: Failed to verify header of idbloader.img which is another issue to resolve. --=20 Tom --1MaLZ7+w12+PvFyj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGzBAABCgAdFiEEGjx/cOCPqxcHgJu/FHw5/5Y0tywFAmInXSgACgkQFHw5/5Y0 tyxaIgv9HFceynpfHYN49fz2QiD92UnzOcufeHBz7UIgYTa9PRI0K9c93/g8H5Wb EYSagD8px8mVBAntd4yB1WQ+fVZmuVL9ClOB2msygtMBKdwBd1TMA9ONVOVlCTlJ WNMVIQhQnA1ShUdQf5y7ZNBQxqtKQg94g31x0BFPwq1nFnKRBzlq0e1tey1i0mZF m0dF+mgY8dHNOhVNL31anckVdIJN435dHZraulErsMokl0rP4RDJh+s6/y81IBGQ xcy8C94t7V1W4H3j+gkS3ruplwvvABJ6iPU6NcIrc8IE1nLKub4HH79dopuOReew 4Zs/XklvtDKwhnbQsuBRmL0ZiEjgW9C7JNk6CvgRFWbA9ztKAr1eX0Ls1AWLjDAz nxb2Tu0BybuuYV5GM44YJPuKs2X1LwN9TOnW2rQt1XzzHGdi4bwIjEB6PLqLohOw 3rEA6caixKGav9jMhSvMUf6v3sodoLA1d/VTWgQcClF41KB18Q+ztXgX5oKAte+A kzClURzi =pmkK -----END PGP SIGNATURE----- --1MaLZ7+w12+PvFyj--