From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 12 Mar 2025 14:06:41 +0100 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.96) (envelope-from ) id 1tsLnG-00D8Bh-0S for lore@lore.pengutronix.de; Wed, 12 Mar 2025 14:06:41 +0100 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 1tsLnB-00022P-Tc for lore@pengutronix.de; Wed, 12 Mar 2025 14:06:41 +0100 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:To:In-Reply-To:References: Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pKwZP7uYMLow+comFdrFE7sqARfGk4YW+ahAWf+psE4=; b=zvSek/GD3E2EmduxNnm8JC+8z7 yJA/WFGFLjazufWJoeQ7Ug8vBVeuFWkmqVX8O6ifXLFj/C3oyhYDNO5WnG6YGzKKPS8tmmQnTvPlb MhXBBKSdD0H2D+3AzFe3AGDlwGBQ39xEfFHHcrYfeStILsMW4CpEsOtV1jVjZxzRhAzlFodf2ohCE 17/fl55J0q+wtMYJmqehrr9NSflm/sZAb3OEeksMdXbmkA22OfAHjkWTOfP86hhXi7KkAArFtkNqG KSGxVnXkxLCXkB70JwgaWXNlYUeqeutSdC/8uhA7zjAs13zj4VpoBis1lvTON3iuykDIL0U+ZreX5 iRdAv1Yw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsLmd-00000008Upo-068k; Wed, 12 Mar 2025 13:06:03 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tsL0W-00000008NQi-0r6T for barebox@lists.infradead.org; Wed, 12 Mar 2025 12:16:22 +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 1tsL0V-0003sQ-03; Wed, 12 Mar 2025 13:16:19 +0100 Received: from dude02.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::28]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1tsL0U-005M8d-27; Wed, 12 Mar 2025 13:16:18 +0100 Received: from localhost ([::1] helo=dude02.red.stw.pengutronix.de) by dude02.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1tsL0U-00AdfG-1o; Wed, 12 Mar 2025 13:16:18 +0100 From: Sascha Hauer Date: Wed, 12 Mar 2025 13:16:24 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250312-rpmb-v1-9-0f213382a3f3@pengutronix.de> References: <20250312-rpmb-v1-0-0f213382a3f3@pengutronix.de> In-Reply-To: <20250312-rpmb-v1-0-0f213382a3f3@pengutronix.de> To: "open list:BAREBOX" X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1741781778; l=5343; i=s.hauer@pengutronix.de; s=20230412; h=from:subject:message-id; bh=LoZZV3tz9DYm+gb8mV7KaSP+8X7FMS51KshZsOBdvUU=; b=gFXq8/LVBYoXAecM2mn5ysLV9cTKr190iAQDjtLOa5vB9oPYt2rsLCG05JO3GexGtgDDDYYIU +vm0BC3En8uBOdkc9Eyy+HcXgqOh1UxvU+nYot0WNxNZ4XVYFjOZONG X-Developer-Key: i=s.hauer@pengutronix.de; a=ed25519; pk=4kuc9ocmECiBJKWxYgqyhtZOHj5AWi7+d0n/UjhkwTg= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250312_051620_252624_14472142 X-CRM114-Status: GOOD ( 19.53 ) 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=-5.2 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 9/9] commands: add avb_pvalue command 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) Android Verified Boot (AVB( 2.0 spec. revision 1.1 introduces support for named persistent values that must be tamper evident and allows AVB to store arbitrary key-value pairs. This patch introduces a command to access this variable store. Variables can be read into a file or an environment variable or printed as hexdump. Variables can be written from file content or a string from the command line. Signed-off-by: Sascha Hauer --- commands/Kconfig | 13 +++++ commands/Makefile | 1 + commands/avb_pvalue.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+) diff --git a/commands/Kconfig b/commands/Kconfig index e41625e294..3d87ba5e09 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -2254,6 +2254,19 @@ config CMD_2048 help Console version of the game "2048" for GNU/Linux +config CMD_AVB_PVALUE + depends on OPTEE_AVB_PERSISTENT_VALUES + tristate + prompt "avb_pvalue" + help + The avb_pvalue command provides access to the Android Verified Boot (AVB) + persistent value store. + + AVB 2.0 spec. revision 1.1 introduces support for named persistent values + that must be tamper evident and allows AVB to store arbitrary key-value + pairs. + + config CMD_BAREBOX_UPDATE tristate select BAREBOX_UPDATE diff --git a/commands/Makefile b/commands/Makefile index e152e4148b..7a635e8791 100644 --- a/commands/Makefile +++ b/commands/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_STDDEV) += stddev.o obj-$(CONFIG_CMD_DIGEST) += digest.o obj-$(CONFIG_COMPILE_HASH) += hashsum.o +obj-$(CONFIG_CMD_AVB_PVALUE) += avb_pvalue.o obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-$(CONFIG_CMD_UIMAGE) += uimage.o obj-$(CONFIG_CMD_LOADB) += loadb.o diff --git a/commands/avb_pvalue.c b/commands/avb_pvalue.c new file mode 100644 index 0000000000..adc44321fb --- /dev/null +++ b/commands/avb_pvalue.c @@ -0,0 +1,138 @@ +// SPDX-License-Identifier: GPL-2.0-only + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int do_avb_pvalue(int argc, char *argv[]) +{ + size_t out = 0x13; + void *buf = NULL; + int ret = 0, rc = COMMAND_ERROR; + int opt; + const char *write_varname = NULL, *read_varname = NULL; + void *val = NULL; + size_t size; + const char *filename = NULL; + const char *varname = NULL; + const int bufsize = SZ_8K; + + while ((opt = getopt(argc, argv, "r:w:f:")) > 0) { + switch(opt) { + case 'r': + read_varname = optarg; + break; + case 'w': + write_varname = optarg; + break; + case 'f': + filename = optarg; + break; + default: + return COMMAND_ERROR_USAGE; + } + } + + argc -= optind; + argv += optind; + + if (!read_varname && !write_varname) + return COMMAND_ERROR_USAGE; + + if (read_varname && write_varname) + return COMMAND_ERROR_USAGE; + + if (write_varname) { + if (argc >= 1) + val = argv[0]; + + if (filename) { + ret = read_file_2(filename, &size, &buf, FILESIZE_MAX); + if (ret) { + printf("Cannot read %s: %pe\n", read_varname, ERR_PTR(ret)); + return COMMAND_ERROR; + } + } else { + if (!val) + return COMMAND_ERROR_USAGE; + size = strlen(val) + 1; + buf = xstrdup(val); + + } + ret = avb_write_persistent_value(write_varname, size, buf); + if (ret) { + printf("Cannot write variable %s: %pe\n", read_varname, ERR_PTR(ret)); + goto err; + } + } + + if (read_varname) { + if (argc >= 1) + varname = argv[0]; + + buf = xzalloc(bufsize); + + ret = avb_read_persistent_value(read_varname, SZ_8K, buf, &out); + if (ret) { + printf("Cannot read variable %s: %pe\n", read_varname, ERR_PTR(ret)); + rc = COMMAND_ERROR; + goto err; + } + + if (filename) { + ret = write_file(filename, buf, out); + if (ret) { + printf("Cannot write %s: %pe\n", filename, ERR_PTR(ret)); + rc = COMMAND_ERROR; + goto err; + } + } else if (varname) { + unsigned char *str = buf; + int i; + + str[bufsize - 1] = 0; + + for (i = 0; i < out; i++) + if (!isprint(str[i])) + break; + + str[i] = 0; + + setenv(varname, buf); + } else { + memory_display(buf, 0, out, 1, 0); + } + } + + rc = 0; + +err: + free(buf); + + return rc; +} + +BAREBOX_CMD_HELP_START(avb_pvalue) +BAREBOX_CMD_HELP_TEXT("This command provides access to the AVB persistent variable store.") +BAREBOX_CMD_HELP_TEXT("usage:") +BAREBOX_CMD_HELP_TEXT("avb_pvalue [OPTION]... [VARNAME/VALUE]") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT ("-r ", "read variable . read value into [VARNAME] if given") +BAREBOX_CMD_HELP_OPT ("-w ", "write variable . Set to [VALUE] if given") +BAREBOX_CMD_HELP_OPT ("-f ", "read/write value from/to file") +BAREBOX_CMD_HELP_END + +BAREBOX_CMD_START(avb_pvalue) + .cmd = do_avb_pvalue, + BAREBOX_CMD_DESC("AVB persistent variable store") + BAREBOX_CMD_OPTS("[-rwf] [VARNAME/VALUE]") + BAREBOX_CMD_HELP(cmd_avb_pvalue_help) + BAREBOX_CMD_GROUP(CMD_GRP_CONSOLE) +BAREBOX_CMD_END -- 2.39.5