{"id":2216032,"url":"http://patchwork.ozlabs.org/api/patches/2216032/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260325165431.1027591-9-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260325165431.1027591-9-sjg@chromium.org>","list_archive_url":null,"date":"2026-03-25T16:54:17","name":"[08/13] boot: Move the architecture check into check_allowed()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8784d3936854a080f8559ca4dabda2e76b127e9f","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260325165431.1027591-9-sjg@chromium.org/mbox/","series":[{"id":497475,"url":"http://patchwork.ozlabs.org/api/series/497475/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=497475","date":"2026-03-25T16:54:09","name":"boot: Make fit_image_load() easier to maintain","version":1,"mbox":"http://patchwork.ozlabs.org/series/497475/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2216032/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2216032/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256\n header.s=google header.b=VWMpVaPP;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org\n header.b=\"VWMpVaPP\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=sjg@chromium.org"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fgtNg41nyz1y1K\n\tfor ; Thu, 26 Mar 2026 03:56:51 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id D923E83FC6;\n\tWed, 25 Mar 2026 17:55:53 +0100 (CET)","by phobos.denx.de (Postfix, from userid 109)\n id 12AA28408D; Wed, 25 Mar 2026 17:55:51 +0100 (CET)","from mail-oi1-x234.google.com (mail-oi1-x234.google.com\n [IPv6:2607:f8b0:4864:20::234])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id E537A83DA7\n for ; Wed, 25 Mar 2026 17:55:48 +0100 (CET)","by mail-oi1-x234.google.com with SMTP id\n 5614622812f47-4673790ab85so3006858b6e.3\n for ; Wed, 25 Mar 2026 09:55:48 -0700 (PDT)","from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n 5614622812f47-46a7099df08sm30481b6e.15.2026.03.25.09.55.45\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 25 Mar 2026 09:55:45 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=chromium.org; s=google; t=1774457747; x=1775062547; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=NRtZGQ9Tiyv0MwLF/Z4HR33frbI32o5MX3Vlk6IoykY=;\n b=VWMpVaPP+7nNe/zvrCnNTmW4YjWlinyZ1l16mN3BbTC1f3IFLp79VnPpbYvT0Ct6ZT\n o0KeVAoBDkyHISboP4h23v7scxz5gas/b269YIq+aiypUp/XyjJfBiKti66vp70f5LrA\n WQU/QqPJ04LZeTgI9VpgznClZldAJGhjlH9ug=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1774457747; x=1775062547;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=NRtZGQ9Tiyv0MwLF/Z4HR33frbI32o5MX3Vlk6IoykY=;\n b=Se+YfiH58ugLVI0IeSJiSdQITd0RHq3s76hnwVYeiLU9GJ6GdceBEOc0/Yiqbt6jY/\n /nKt84swgrvhGgQmfVyuDt3Kng4QFT6ELZODXm5vkprsk9JRBnMu+Z/2e6RLTvo7q78Q\n RZJt5Any4OLuCB5nsZtsCygiS3by3c9iF0nav9UGmSQHZAdHjgsY51Qml0tgf1zhhwha\n /CVOWbHflgVOZLWPVl9XxJNY3OaunWEHJnQ9A/Mo8VdPp9rBiceNDUemu8C7UUU0DsQ9\n h6ojbpKlb8VNPbkoQ09KAnyr7ubQkJztsYXgTCb4I/aoB0Q22DGiVLe0gT2uqGxJU3cB\n sKdQ==","X-Gm-Message-State":"AOJu0YxZgzdd5KLXILhqIejxyd9b9FEBKp/koLSCbmrGU71CHBwn5/FC\n 36b7fZxt4VzNO6cTnSa31Bgfe7sLhtG1hhxpYVvdl5d3DAFf5Yn1rllEnHBjldyQ7rr3uPpeC13\n ijf8SNQ==","X-Gm-Gg":"ATEYQzyoCyY0VCoQ96Am2kXplTWIsIoFhFUUXMHJFPsv8jJUAAvyDdcx/IfL9dlmAUj\n 92xBTPDReX32RZhCnX6BnYyZNf3lV0v0fpQSAvQWYLzdssEY+Izd+SFPV0hWkCzp1utNyRz7zIz\n OiJmJduFsl8Qdwpc4AOMGOI436tom5gEyTWqlOx7E4zKf+p3V7zkuleSoM0UbDsoTb0IPUpUDoS\n rDBoJxiKIgDZJhuz+0sR6sXcx1/VFlWVAcL3gMYHaj8dKAylUYJ3Goje5Zb3/1j9NMYVE8VVVzc\n A5nwzZ+DkUoLQx05uDBSoPpsVarjj1/bD0qlesuKbzUQmL6qHyaZ9wa0ol6RSIUPIlMF6tXLlmd\n 5doU5CEBoKjGuHT4lio+TF3Uox5pDMoDuZ0HxBOuzhll7W5Hk8PeD4l3iD7AbknsUUlqOVRitSS\n dm/JjGRAwSv10n4yV58w==","X-Received":"by 2002:a05:6808:1b89:b0:467:f150:afbc with SMTP id\n 5614622812f47-46a5c59d6ddmr1934512b6e.6.1774457747065;\n Wed, 25 Mar 2026 09:55:47 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"Simon Glass ,\n James Hilliard ,\n Marek Vasut ,\n Quentin Schulz , Tom Rini ","Subject":"[PATCH 08/13] boot: Move the architecture check into check_allowed()","Date":"Wed, 25 Mar 2026 10:54:17 -0600","Message-ID":"<20260325165431.1027591-9-sjg@chromium.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260325165431.1027591-1-sjg@chromium.org>","References":"<20260325165431.1027591-1-sjg@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"We may as well have all the checks together, so move the call to\nfit_image_check_target_arch() into check_allowed().\n\nSigned-off-by: Simon Glass \n---\n\n boot/image-fit.c | 18 +++++++++---------\n 1 file changed, 9 insertions(+), 9 deletions(-)","diff":"diff --git a/boot/image-fit.c b/boot/image-fit.c\nindex ba8a56a8ff4..0a880863063 100644\n--- a/boot/image-fit.c\n+++ b/boot/image-fit.c\n@@ -2194,6 +2194,15 @@ static int check_allowed(const void *fit, int noffset,\n \tbool type_ok, os_ok;\n \tuint8_t os;\n \n+\tbootstage_mark(bootstage_id + BOOTSTAGE_SUB_CHECK_ARCH);\n+\tif (!tools_build() && IS_ENABLED(CONFIG_SANDBOX)) {\n+\t\tif (!fit_image_check_target_arch(fit, noffset)) {\n+\t\t\tputs(\"Unsupported Architecture\\n\");\n+\t\t\tbootstage_error(bootstage_id + BOOTSTAGE_SUB_CHECK_ARCH);\n+\t\t\treturn -ENOEXEC;\n+\t\t}\n+\t}\n+\n \tbootstage_mark(bootstage_id + BOOTSTAGE_SUB_CHECK_ALL);\n \ttype_ok = fit_image_check_type(fit, noffset, image_type) ||\n \t\t fit_image_check_type(fit, noffset, IH_TYPE_FIRMWARE) ||\n@@ -2379,15 +2388,6 @@ int fit_image_load(struct bootm_headers *images, ulong addr,\n \tif (noffset < 0)\n \t\treturn noffset;\n \n-\tbootstage_mark(bootstage_id + BOOTSTAGE_SUB_CHECK_ARCH);\n-\tif (!tools_build() && IS_ENABLED(CONFIG_SANDBOX)) {\n-\t\tif (!fit_image_check_target_arch(fit, noffset)) {\n-\t\t\tputs(\"Unsupported Architecture\\n\");\n-\t\t\tbootstage_error(bootstage_id + BOOTSTAGE_SUB_CHECK_ARCH);\n-\t\t\treturn -ENOEXEC;\n-\t\t}\n-\t}\n-\n \tret = check_allowed(fit, noffset, image_type, arch, bootstage_id);\n \tif (ret)\n \t\treturn ret;\n","prefixes":["08/13"]}