From patchwork Fri Aug 9 16:16:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Protsenko X-Patchwork-Id: 1144801 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="UWXTIvPw"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 464r2p72H7z9sPY for ; Sat, 10 Aug 2019 02:16:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 759BDC21C29; Fri, 9 Aug 2019 16:16:14 +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 F2BCBC21C29; Fri, 9 Aug 2019 16:16:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0FDB2C21C29; Fri, 9 Aug 2019 16:16:12 +0000 (UTC) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by lists.denx.de (Postfix) with ESMTPS id 6C130C21BE5 for ; Fri, 9 Aug 2019 16:16:11 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id y8so3038328plr.12 for ; Fri, 09 Aug 2019 09:16:11 -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=7RHuEFlvDq76qjCtMH3GT5ObP+XSbms5NB1I8lIEbTk=; b=UWXTIvPwh3hv2YdSO5rw9lqeree4tCA91tejTKjNMr9nY8p1XrIX17yQWOWjvQtes6 1wtXC//yrWKYGCvV+EUbbypOxxTQR+DH1xjrkUs22ERjutKJ2Q4JmDhQi/CsJYkMRO7E 5d++ItZ4EfgArydcOH3mFBHZQSUwQBzQ6YS+LQXgCXmoO6HmBOYqQJO0vfouKYizB8Hx IMRYwMmrhCdMmRJgFoSlxXfkG25pcr59IxPVLxl4MYtTEPE1zQZBGH7PvtvjUBgOeVrp tjp3W2vh4baBV7ywPPYw5iTkmYz5Gml/Wl5keFovfJ0uwE4IrUyWUHtcXx+pnCin1W44 Gqmw== 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=7RHuEFlvDq76qjCtMH3GT5ObP+XSbms5NB1I8lIEbTk=; b=h3s8GxtyrvVC9CecBIxJ1GWatOJULkyejUnCEHYeBqvVcaqPRHZIUCn67zAsChKMn1 tTYi7PmyUsepeH3VQ2NLYBQK9qcATu3/gdXkdN3nMhe7E2y+AA8pkBsgCG/OIMi6hf99 sd2HI/Btd2/6JuEvpFMnSCpgvCUtpFZ85JLz4CktBGeOfktapbSYO4ZWHgmo7j9DD8ad kMshhJxj5ObMfxXH3sCfAvrjw8lFA9yWPObj9p5q09TUGG0oFaCyhb6JcwhcpJkceSvg 9qaycEHEQLqHwaA55LDixExFakIhPp5k8+AwQ/ePVLs+zEVymSp+4bMEbRbxP3cIGLFB WJeA== X-Gm-Message-State: APjAAAUd2HvR5CH0h/ZzQi6hBIXsP9TuR4r3EMnYbxoRZltC9iFPyBV+ 59n+upFGOdoAYH0Ezairxmpjq/YZYGvAHg== X-Google-Smtp-Source: APXvYqz03A9m2KZL4KRupDxvOGl2ZTUEVtMLJ4N1BEGCeZnWkUAFCZoztErqRhUfIgDRD8z9PzBsPw== X-Received: by 2002:a17:902:2bcb:: with SMTP id l69mr19896809plb.155.1565367369384; Fri, 09 Aug 2019 09:16:09 -0700 (PDT) Received: from localhost ([2001:67c:2e5c:2011:2e0:4cff:fe68:2882]) by smtp.gmail.com with ESMTPSA id w4sm123456711pfn.144.2019.08.09.09.16.07 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 09 Aug 2019 09:16:08 -0700 (PDT) From: Sam Protsenko To: u-boot@lists.denx.de Date: Fri, 9 Aug 2019 19:16:03 +0300 Message-Id: <20190809161603.26055-1-semen.protsenko@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Cc: Tom Rini , Praneeth Bajjuri , Eugeniu Rosca Subject: [U-Boot] [PATCH] 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/+/master/test/avb_slot_verify_unittest.cc#108 [2] https://android.googlesource.com/platform/external/avb/+/master/libavb/avb_slot_verify.c#1461 Signed-off-by: Sam Protsenko Acked-by: Igor Opaniuk --- cmd/avb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmd/avb.c b/cmd/avb.c index d1942d6605..8f2bb85fce 100644 --- a/cmd/avb.c +++ b/cmd/avb.c @@ -14,11 +14,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; @@ -231,6 +226,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;