From patchwork Thu Aug 15 17:49:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 1147731 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="eqNDzGSd"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 468YrG4cm5z9sN1 for ; Fri, 16 Aug 2019 03:50:06 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3477FC21C38; Thu, 15 Aug 2019 17:49:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 1F508C21C29; Thu, 15 Aug 2019 17:49:58 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 69626C21C29; Thu, 15 Aug 2019 17:49:56 +0000 (UTC) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by lists.denx.de (Postfix) with ESMTPS id AFB9BC21C27 for ; Thu, 15 Aug 2019 17:49:55 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id u17so1605283pgi.6 for ; Thu, 15 Aug 2019 10:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=imeicfDcGdpYAww/8cbpVguSD59grHdq25zHWjS63UM=; b=eqNDzGSdWfOSfYkQ2zc+Iyo3xCUrIqsmUvCX5prlFbvfWqNNdV8OcVYzWvdsc32xIy L93CWe10mWgvArugrfRdKjXjDc4yzLSmOoAGhABc0ClscyXyGI9agiLUXeujavOscPBl 9Mv8WD3wjCGy/7KesQjDnLdOSQ2lU8PrAHD7MhuwLwYNgSRkhpFJADrw8envooxPg8Cq AsI/lNZP7kARNIOIEz44mIpIr/1wSErtk9K2ixHVo1NkiCJMAT9kkyyIlQHkxtHvv/aX 8IfaxXnEN2H5oea4tCe5emXWBSWfNG12IbKpvIHCkniLEOyWSfQtPcr2IsiszhtXk10A jr3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=imeicfDcGdpYAww/8cbpVguSD59grHdq25zHWjS63UM=; b=OYdBJ7HGHTGTZzps78o0B+nmY9veuRt7/RIzpp1WPBtF4akEl+w283wKYOKTvgG2j4 xsvGdmMgqz2XpcBsFR/Snze2owTELsK0uQ8+SuxEIByo2hDBs4CizZUzrr2n6WjaS/HA Og6ltM60cUrWBqHuXLuMQqzE1m0nEsf/B68Jazl6hx9Zb3frFD6KhGHTkwkXXvrKnm3a M4rPnCYnpxv07LAgicaxUUbjrQ7N5bKU6M0JWsV9J32CNcO+l6rulQo8SiGoISiAJDtX QjRaW7mb+Yak8i23QdmaeCDnSEuI+OVu4XNsxQqCxk1V1jEDytNhD2wUCEl/sgRBJiBv fIVQ== X-Gm-Message-State: APjAAAWevwYeRNkBZSKVYV4kKVMVld5whUQkLnxjot9zvzMFEkXA1kUq 4/NxI1vDQNeFJtCbtKsyrrYon00H2hJgTw== X-Google-Smtp-Source: APXvYqzkmOzE1EkY6huWAjUtZPsElozwcl7/pJGCe4mwCYStn11On2iy+fbP2IkVSHuk+ugp5aENlg== X-Received: by 2002:aa7:8202:: with SMTP id k2mr6755771pfi.31.1565891393902; Thu, 15 Aug 2019 10:49:53 -0700 (PDT) Received: from localhost ([2001:67c:2e5c:2011:2e0:4cff:fe68:2882]) by smtp.gmail.com with ESMTPSA id bt18sm1964575pjb.1.2019.08.15.10.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 10:49:53 -0700 (PDT) From: Sam Protsenko To: u-boot@lists.denx.de Date: Thu, 15 Aug 2019 20:49:47 +0300 Message-Id: <20190815174947.4316-1-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.23.0.rc1 MIME-Version: 1.0 Cc: Tom Rini , Praneeth Bajjuri , Eugeniu Rosca Subject: [U-Boot] [PATCH v2] cmd: avb: Fix requested partitions list X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The requested_partitions[] array should contain only boot partitions. Usually it's only 'boot' partition, as can be seen in [1]. Also, seems like the requested_partitions[] are only used when there is no 'vbmeta' partition [2], which is not a regular use-case. Make requested_partitions[] contain only 'boot' partition as it was supposed to be, and also make that array to be a local in do_avb_verify_part() function, as nobody else needs that. [1] https://android.googlesource.com/platform/external/avb/+/5fbb42a189aa/test/avb_slot_verify_unittest.cc#108 [2] https://android.googlesource.com/platform/external/avb/+/5fbb42a189aa/libavb/avb_slot_verify.c#1461 Signed-off-by: Sam Protsenko Reviewed-by: Igor Opaniuk --- Changes in v2: - fix links in commit message (suggested by Eugeniu Rosca) cmd/avb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmd/avb.c b/cmd/avb.c index a8a95034ca..a4de5c40a2 100644 --- a/cmd/avb.c +++ b/cmd/avb.c @@ -15,11 +15,6 @@ #define AVB_BOOTARGS "avb_bootargs" static struct AvbOps *avb_ops; -static const char * const requested_partitions[] = {"boot", - "system", - "vendor", - NULL}; - int do_avb_init(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { unsigned long mmc_dev; @@ -232,6 +227,7 @@ int do_avb_get_uuid(cmd_tbl_t *cmdtp, int flag, int do_avb_verify_part(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { + const char * const requested_partitions[] = {"boot", NULL}; AvbSlotVerifyResult slot_result; AvbSlotVerifyData *out_data; char *cmdline;