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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7355DC4338F for ; Tue, 3 Aug 2021 05:30:08 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B4FDC60295 for ; Tue, 3 Aug 2021 05:30:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B4FDC60295 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9C1A082D1C; Tue, 3 Aug 2021 07:30:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="u9Altuf1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AA87882D7E; Tue, 3 Aug 2021 07:30:02 +0200 (CEST) Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) (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 DC23982D1B for ; Tue, 3 Aug 2021 07:29:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pl1-x636.google.com with SMTP id u2so14046602plg.10 for ; Mon, 02 Aug 2021 22:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=l5bQNB2uBqU+yYT2+WLIYcSdyZELscXn1ojHWNjOijg=; b=u9Altuf1BlshRZGcUoTI/M6AOubmsFtDQL3sOyKkOdsspc6ODVy6hFfAm7L1ce1ARY GW+PHzpWmRFtfP/YRJcrtJdXBoJpF1ZJ9v1NdSW6X7n/pLvvZrR9cZwrGBsR2wUfepO0 H2zWejk8d/B7+z/nwOniJ/aZqDS+EM9FcutPI+xFpv1qQEOuXqV/ju98FedpWJwXUxxl JIhu6P7uREWTgdGKKJKlMaFIz5PIiecGDQEp8lE2FpKXmv4DpPsoO1ZQ6L5F6C9ksjoG 9TxrnJaNmdBDsXg8P6VqQZhEYZlJXw6tbWVl5ouU+7nJX5eS/PTfx/iA37VKM7EZatgr kcgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=l5bQNB2uBqU+yYT2+WLIYcSdyZELscXn1ojHWNjOijg=; b=bl456eF+tlpiAn0UTtfU4Ya+PPOSIUkDOgeKfv1tt1ZhNuEQhZSXc99Oq02i1nGUKA vDhoOCMILsVgDK1ml3JFb+QNvma2ksfFp/EEb1HWK9ItueL8iHKbYgUt813CuiICv9xB 3EVau+VsjEGQg7ljogSwJeQmQDgCTZtVcG+wuWanKeSb+qVMFijPUQ5TYg7JCnTLnU6V LyMfGP2ljcW58K2TAASpisLJ/4i/jcRUZKqB98cYpBz4AsoWBbxjtxYxMh+xkj2uGavX P3Skydl/hFywACTkVl0XwgnZL/oAn43bXij7FevFLftuRJh6nelTYwW4BgCwvuoH1/Jo ttZg== X-Gm-Message-State: AOAM533b0xXXa6K0oEXTaES8LazDkOynhmPA0r1x2YmAmyKs6WKoTnIN nfc0b8BLFP+96hezhTPGXsCEvA== X-Google-Smtp-Source: ABdhPJy6vVQtXXqhXGnRc5NUHQ4+RUCZ+DHktyv7Wp96DtwZj4aBxahqBn2mJeVgd/+wp+a/IYvzRw== X-Received: by 2002:a17:90b:34a:: with SMTP id fh10mr20790383pjb.134.1627968595982; Mon, 02 Aug 2021 22:29:55 -0700 (PDT) Received: from laputa (pdb6272b1.tkyea130.ap.so-net.ne.jp. [219.98.114.177]) by smtp.gmail.com with ESMTPSA id t30sm15934389pgl.47.2021.08.02.22.29.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Aug 2021 22:29:55 -0700 (PDT) Date: Tue, 3 Aug 2021 14:29:51 +0900 From: KASHI Takahiro To: Simon Glass Cc: U-Boot Mailing List , Ilias Apalodimas , Heinrich Schuchardt , Alexander Graf Subject: Re: [PATCH v2 2/3] Revert "mkeficapsule: Remove dtb related options" Message-ID: <20210803052951.GA395114@laputa> Mail-Followup-To: KASHI Takahiro , Simon Glass , U-Boot Mailing List , Ilias Apalodimas , Heinrich Schuchardt , Alexander Graf References: <20210802144431.2396678-1-sjg@chromium.org> <20210802144431.2396678-3-sjg@chromium.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210802144431.2396678-3-sjg@chromium.org> X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean Simon, On Mon, Aug 02, 2021 at 08:44:30AM -0600, Simon Glass wrote: > This reverts commit f86caab058ff062ce72b24cd1ab9ec1253cc1352. Whether we choose a devicetree approach or not, we don't have to revert this patch because we can do the same thing with standard commands (i.e. fdtoverlay). See my patches and discussions[1]. (We all agreed to removing this feature from mkeficapsule.) [1] https://lists.denx.de/pipermail/u-boot/2021-May/449573.html https://lists.denx.de/pipermail/u-boot/2021-May/449574.html -Takahiro Akashi > Signed-off-by: Simon Glass > --- > > (no changes since v1) > > tools/mkeficapsule.c | 229 +++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 222 insertions(+), 7 deletions(-) > > diff --git a/tools/mkeficapsule.c b/tools/mkeficapsule.c > index 4995ba4e0c2..de0a6289888 100644 > --- a/tools/mkeficapsule.c > +++ b/tools/mkeficapsule.c > @@ -4,17 +4,22 @@ > * Author: AKASHI Takahiro > */ > > +#include > #include > #include > #include > #include > #include > #include > +#include > #include > > +#include > #include > #include > > +#include "fdt_host.h" > + > typedef __u8 u8; > typedef __u16 u16; > typedef __u32 u32; > @@ -24,6 +29,9 @@ typedef __s32 s32; > > #define aligned_u64 __aligned_u64 > > +#define SIGNATURE_NODENAME "signature" > +#define OVERLAY_NODENAME "__overlay__" > + > #ifndef __packed > #define __packed __attribute__((packed)) > #endif > @@ -44,6 +52,9 @@ static struct option options[] = { > {"raw", required_argument, NULL, 'r'}, > {"index", required_argument, NULL, 'i'}, > {"instance", required_argument, NULL, 'I'}, > + {"dtb", required_argument, NULL, 'D'}, > + {"public key", required_argument, NULL, 'K'}, > + {"overlay", no_argument, NULL, 'O'}, > {"help", no_argument, NULL, 'h'}, > {NULL, 0, NULL, 0}, > }; > @@ -57,10 +68,187 @@ static void print_usage(void) > "\t-r, --raw new raw image file\n" > "\t-i, --index update image index\n" > "\t-I, --instance update hardware instance\n" > + "\t-K, --public-key public key esl file\n" > + "\t-D, --dtb dtb file\n" > + "\t-O, --overlay the dtb file is an overlay\n" > "\t-h, --help print a help message\n", > tool_name); > } > > +static int fdt_add_pub_key_data(void *sptr, void *dptr, size_t key_size, > + bool overlay) > +{ > + int parent; > + int ov_node; > + int frag_node; > + int ret = 0; > + > + if (overlay) { > + /* > + * The signature would be stored in the > + * first fragment node of the overlay > + */ > + frag_node = fdt_first_subnode(dptr, 0); > + if (frag_node == -FDT_ERR_NOTFOUND) { > + fprintf(stderr, > + "Couldn't find the fragment node: %s\n", > + fdt_strerror(frag_node)); > + goto done; > + } > + > + ov_node = fdt_subnode_offset(dptr, frag_node, OVERLAY_NODENAME); > + if (ov_node == -FDT_ERR_NOTFOUND) { > + fprintf(stderr, > + "Couldn't find the __overlay__ node: %s\n", > + fdt_strerror(ov_node)); > + goto done; > + } > + } else { > + ov_node = 0; > + } > + > + parent = fdt_subnode_offset(dptr, ov_node, SIGNATURE_NODENAME); > + if (parent == -FDT_ERR_NOTFOUND) { > + parent = fdt_add_subnode(dptr, ov_node, SIGNATURE_NODENAME); > + if (parent < 0) { > + ret = parent; > + if (ret != -FDT_ERR_NOSPACE) { > + fprintf(stderr, > + "Couldn't create signature node: %s\n", > + fdt_strerror(parent)); > + } > + } > + } > + if (ret) > + goto done; > + > + /* Write the key to the FDT node */ > + ret = fdt_setprop(dptr, parent, "capsule-key", > + sptr, key_size); > + > +done: > + if (ret) > + ret = ret == -FDT_ERR_NOSPACE ? -ENOSPC : -EIO; > + > + return ret; > +} > + > +static int add_public_key(const char *pkey_file, const char *dtb_file, > + bool overlay) > +{ > + int ret; > + int srcfd = -1; > + int destfd = -1; > + void *sptr = NULL; > + void *dptr = NULL; > + off_t src_size; > + struct stat pub_key; > + struct stat dtb; > + > + /* Find out the size of the public key */ > + srcfd = open(pkey_file, O_RDONLY); > + if (srcfd == -1) { > + fprintf(stderr, "%s: Can't open %s: %s\n", > + __func__, pkey_file, strerror(errno)); > + ret = -1; > + goto err; > + } > + > + ret = fstat(srcfd, &pub_key); > + if (ret == -1) { > + fprintf(stderr, "%s: Can't stat %s: %s\n", > + __func__, pkey_file, strerror(errno)); > + ret = -1; > + goto err; > + } > + > + src_size = pub_key.st_size; > + > + /* mmap the public key esl file */ > + sptr = mmap(0, src_size, PROT_READ, MAP_SHARED, srcfd, 0); > + if (sptr == MAP_FAILED) { > + fprintf(stderr, "%s: Failed to mmap %s:%s\n", > + __func__, pkey_file, strerror(errno)); > + ret = -1; > + goto err; > + } > + > + /* Open the dest FDT */ > + destfd = open(dtb_file, O_RDWR); > + if (destfd == -1) { > + fprintf(stderr, "%s: Can't open %s: %s\n", > + __func__, dtb_file, strerror(errno)); > + ret = -1; > + goto err; > + } > + > + ret = fstat(destfd, &dtb); > + if (ret == -1) { > + fprintf(stderr, "%s: Can't stat %s: %s\n", > + __func__, dtb_file, strerror(errno)); > + goto err; > + } > + > + dtb.st_size += src_size + 0x30; > + if (ftruncate(destfd, dtb.st_size)) { > + fprintf(stderr, "%s: Can't expand %s: %s\n", > + __func__, dtb_file, strerror(errno)); > + ret = -1; > + goto err; > + } > + > + errno = 0; > + /* mmap the dtb file */ > + dptr = mmap(0, dtb.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, > + destfd, 0); > + if (dptr == MAP_FAILED) { > + fprintf(stderr, "%s: Failed to mmap %s:%s\n", > + __func__, dtb_file, strerror(errno)); > + ret = -1; > + goto err; > + } > + > + if (fdt_check_header(dptr)) { > + fprintf(stderr, "%s: Invalid FDT header\n", __func__); > + ret = -1; > + goto err; > + } > + > + ret = fdt_open_into(dptr, dptr, dtb.st_size); > + if (ret) { > + fprintf(stderr, "%s: Cannot expand FDT: %s\n", > + __func__, fdt_strerror(ret)); > + ret = -1; > + goto err; > + } > + > + /* Copy the esl file to the expanded FDT */ > + ret = fdt_add_pub_key_data(sptr, dptr, src_size, overlay); > + if (ret < 0) { > + fprintf(stderr, "%s: Unable to add public key to the FDT\n", > + __func__); > + ret = -1; > + goto err; > + } > + > + ret = 0; > + > +err: > + if (sptr) > + munmap(sptr, src_size); > + > + if (dptr) > + munmap(dptr, dtb.st_size); > + > + if (srcfd != -1) > + close(srcfd); > + > + if (destfd != -1) > + close(destfd); > + > + return ret; > +} > + > static int create_fwbin(char *path, char *bin, efi_guid_t *guid, > unsigned long index, unsigned long instance) > { > @@ -178,16 +366,22 @@ err_1: > int main(int argc, char **argv) > { > char *file; > + char *pkey_file; > + char *dtb_file; > efi_guid_t *guid; > unsigned long index, instance; > int c, idx; > + int ret; > + bool overlay = false; > > file = NULL; > + pkey_file = NULL; > + dtb_file = NULL; > guid = NULL; > index = 0; > instance = 0; > for (;;) { > - c = getopt_long(argc, argv, "f:r:i:I:v:h", options, &idx); > + c = getopt_long(argc, argv, "f:r:i:I:v:D:K:Oh", options, &idx); > if (c == -1) > break; > > @@ -214,22 +408,43 @@ int main(int argc, char **argv) > case 'I': > instance = strtoul(optarg, NULL, 0); > break; > + case 'K': > + if (pkey_file) { > + printf("Public Key already specified\n"); > + return -1; > + } > + pkey_file = optarg; > + break; > + case 'D': > + if (dtb_file) { > + printf("DTB file already specified\n"); > + return -1; > + } > + dtb_file = optarg; > + break; > + case 'O': > + overlay = true; > + break; > case 'h': > print_usage(); > return 0; > } > } > > - /* need an output file */ > - if (argc != optind + 1) { > + /* need a fit image file or raw image file */ > + if (!file && !pkey_file && !dtb_file) { > print_usage(); > exit(EXIT_FAILURE); > } > > - /* need a fit image file or raw image file */ > - if (!file) { > - print_usage(); > - exit(EXIT_SUCCESS); > + if (pkey_file && dtb_file) { > + ret = add_public_key(pkey_file, dtb_file, overlay); > + if (ret == -1) { > + printf("Adding public key to the dtb failed\n"); > + exit(EXIT_FAILURE); > + } else { > + exit(EXIT_SUCCESS); > + } > } > > if (create_fwbin(argv[optind], file, guid, index, instance) > -- > 2.32.0.554.ge1b32706d8-goog >