From patchwork Tue Aug 14 00:43:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 957318 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FOXVkJan"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41qDP3655tz9s7c for ; Tue, 14 Aug 2018 10:43:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 077CDC21DD9; Tue, 14 Aug 2018 00:43:42 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 17BE7C21CB6; Tue, 14 Aug 2018 00:43:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6A711C21CB6; Tue, 14 Aug 2018 00:43:38 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id 93745C21C8B for ; Tue, 14 Aug 2018 00:43:37 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id b15-v6so15713198wrv.10 for ; Mon, 13 Aug 2018 17:43:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aueFkGVGfIDPV025Q2FRGQjLFWqd0NqYSkyd9ly4jM8=; b=FOXVkJanN9xBp9Q0k8CoJgBMTLqTGgZ5PV1yX1zj75N6s6KmkNPqICNlShf4IH4pVg SWRTkchTtvRqCItoBu4bF+nc4reuuHGy16VbamZqM5AKVFvmu2RUhNz5GqZtMdjEiaMZ 5YjUi0omgmEmd8pAvp2eo7MeVwmjk8ULmD8l27OdspZv5qYL5LFhJOEwRxi/ScYpUiPE pHJpSRTLIt4RvUx6zOpFefxGYSZgQ7PwLMjnEi025didYa2SDCdfnmVVe8jbaQkw7vD5 i+++TwPZEoRxBgSjDAkmiKYyUjcAZkcIPxvUyJg1ij0F4LolyfJZat4yiHrWNUJW2NWg xBfA== 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=aueFkGVGfIDPV025Q2FRGQjLFWqd0NqYSkyd9ly4jM8=; b=TQtAnaegIVfGlH1RtjwVIAFDogB5JOMFShPFb3iztF8zB47Yhgs0Jbw4Bs7tXCO289 Tou3eY4Pu5kgDMthhmPPFIL1BvHqS7S0LyJNob/GpV/v/+JqYL6AKan8tOBNDPXXDrL8 UqzcMAuwdR8blk/16iAUJ4q9reW3mSCtOIZtnlgqpbmd8MmFpXRkSlwmEciqPRl7XxFV BDLtt+V/a9Ci8Dhydf7LgtEcnPYj9xrXs7kytAa/XUQAlNOJX/tdvDyO/qCnh24KPh8l YWaX0sE/tY7P7A93rTyE95PxRl8R8vR58GUgkmCDAKg13lzJgFijF4FQOf5QLc2fe1L0 OB4g== X-Gm-Message-State: AOUpUlHOBiiPEVDCnIStxLbiM68K4ohsk51R4dstPu/lAVKOK0yzCYu+ XgMhDxTKsu6jnaI+lK1QQro= X-Google-Smtp-Source: AA+uWPyWBjn+MGv4ocQ44z3unCoTWh6/8SSqHJK8GN3XTWX1b0qcDkBFpJ4nVvFM02HP6E1qVrMfaw== X-Received: by 2002:adf:ab14:: with SMTP id q20-v6mr12083307wrc.239.1534207417221; Mon, 13 Aug 2018 17:43:37 -0700 (PDT) Received: from localhost.localdomain (ipb218f402.dynamic.kabel-deutschland.de. [178.24.244.2]) by smtp.gmail.com with ESMTPSA id 66-v6sm23832576wmw.34.2018.08.13.17.43.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Aug 2018 17:43:36 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Igor Opaniuk , u-boot@lists.denx.de Date: Tue, 14 Aug 2018 02:43:03 +0200 Message-Id: <20180814004309.15271-1-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 Cc: Ievgen Maliarenko , Eugeniu Rosca Subject: [U-Boot] [PATCH 1/7] libavb: Handle wrong hashtree_error_mode in avb_append_options() 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" From: Ievgen Maliarenko Exit with AVB_SLOT_VERIFY_RESULT_ERROR_INVALID_ARGUMENT when hashtree_error_mode value passed to avb_append_options() is unknown (not from AvbHashtreeErrorMode enum). Otherwise, default value is not handled in the switch(hashtree_error_mode), which causes below compile warning: lib/libavb/avb_cmdline.c: In function ‘avb_append_options’: lib/libavb/avb_cmdline.c:354:13: warning: ‘dm_verity_mode’ may be used uninitialized in this function [-Wmaybe-uninitialized] new_ret = avb_replace( ~~~~~~~~^~~~~~~~~~~~~~ slot_data->cmdline, "$(ANDROID_VERITY_MODE)", dm_verity_mode); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ lib/libavb/avb_cmdline.c:363:8: warning: ‘verity_mode’ may be used uninitialized in this function [-Wmaybe-uninitialized] if (!cmdline_append_option( ^~~~~~~~~~~~~~~~~~~~~~ slot_data, "androidboot.veritymode", verity_mode)) { Signed-off-by: Ievgen Maliarenko Signed-off-by: Eugeniu Rosca Reviewed-by: Igor Opaniuk --- lib/libavb/avb_cmdline.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libavb/avb_cmdline.c b/lib/libavb/avb_cmdline.c index 91a6615c740d..d24669927203 100644 --- a/lib/libavb/avb_cmdline.c +++ b/lib/libavb/avb_cmdline.c @@ -331,6 +331,9 @@ AvbSlotVerifyResult avb_append_options( verity_mode = "logging"; dm_verity_mode = "ignore_corruption"; break; + default: + ret = AVB_SLOT_VERIFY_RESULT_ERROR_INVALID_ARGUMENT; + goto out; } new_ret = avb_replace( slot_data->cmdline, "$(ANDROID_VERITY_MODE)", dm_verity_mode); From patchwork Tue Aug 14 00:43:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 957319 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rwz+9zv/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41qDPl5MJwz9s7c for ; Tue, 14 Aug 2018 10:44:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 73C0FC21D74; Tue, 14 Aug 2018 00:43: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=FREEMAIL_FROM, 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 E7EFCC21E08; Tue, 14 Aug 2018 00:43:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 95B3AC21E0B; Tue, 14 Aug 2018 00:43:51 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id F297AC21D72 for ; Tue, 14 Aug 2018 00:43:47 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id s9-v6so10571890wmh.3 for ; Mon, 13 Aug 2018 17:43:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ss0NnlgeBk0zkHYpIOS+fNlCY7tA0VgWvC2gpt3m51E=; b=rwz+9zv/whW+sQ/dSj1hiqg5i6/Ebo18ZBDQIpwsXgcOM/dPSmieeS1bkNGDgkn5fW w+hS/HWTGIuMh1pEMp3RZrl7VpBHTvMsyxnIACPX/rL/XeH37fwYkVThPM1zs8LQOMDN t/HOvgUIVgM+RbJtjgQnAhJcT26sVKPAMOyiKTB5NQ+01bmEND+9z6tVUaetJE+ZzvE7 2cmaZM6Jw+dao9Nyymnx2+OKjLdqCHuXstFtggYiXa2KiY/P7TdFtX01jn1bKe1e9tuD 7HR+J0WaJdxdfWEBD8U3iq/+uzT7fl74Dvptjy2R2XW8sWjyg2pzHTneOYQE1YAJSeIb 41lA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ss0NnlgeBk0zkHYpIOS+fNlCY7tA0VgWvC2gpt3m51E=; b=Ns/FgP6OspR08ujxo36nLfdIhRCRwOk7+3tqAmm4stMoF1z0vM1UGSLV90C400lmI9 KvKaMHLoxPdCR3ietKMx18lJD5npqoau9PgPtXIc01pAtqbtu/LHAaTjzN3EdmvJpKX6 ml33i5T6v2gcuYaTbQtMVqeYI4DPX8iPb71NdGx9BouHdNDOS6SkdEuBuKaWg7WcqP1i T0DWOeGUP7sb11ZABZNlcJzdOmwe7/KWDhUwrNesIdPIowiMtkh7mxfDjUGs7/rEakgK 49DK9qpep9bx1VSjlXoN5b17J5LdWfq9GSaLn9XprOmjEgBeuz+MO0x+iEsPSH+N+Lee BPpQ== X-Gm-Message-State: AOUpUlFWAkENsNOc279Ho3n3M5seE3AJmoCAGYpc0o/gUCFCJGTQg2Nz iVnfSDuXNNVamnZYgdEqowA= X-Google-Smtp-Source: AA+uWPxDm8VZG5RsFLNAydcfI8vb6aO+UoKBWW0jufx9/2ozLbYaFzkFKzy1KIAfQWNoII64KFPvfA== X-Received: by 2002:a1c:984d:: with SMTP id a74-v6mr2006113wme.73.1534207427678; Mon, 13 Aug 2018 17:43:47 -0700 (PDT) Received: from localhost.localdomain (ipb218f402.dynamic.kabel-deutschland.de. [178.24.244.2]) by smtp.gmail.com with ESMTPSA id 66-v6sm23832576wmw.34.2018.08.13.17.43.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Aug 2018 17:43:46 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Igor Opaniuk , u-boot@lists.denx.de Date: Tue, 14 Aug 2018 02:43:04 +0200 Message-Id: <20180814004309.15271-2-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180814004309.15271-1-erosca@de.adit-jv.com> References: <20180814004309.15271-1-erosca@de.adit-jv.com> MIME-Version: 1.0 Cc: Eugeniu Rosca Subject: [U-Boot] [PATCH 2/7] common: avb_verify: Fix invalid 'for' loop condition 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" Fix below compiler [1] warning: common/avb_verify.c: In function ‘avb_find_dm_args’: common/avb_verify.c:179:30: warning: left-hand operand of comma expression has no effect [-Wunused-value] for (i = 0; i < AVB_MAX_ARGS, args[i]; ++i) { [1] aarch64-linux-gnu-gcc (Linaro GCC 7.2-2017.11) Signed-off-by: Eugeniu Rosca Reviewed-by: Igor Opaniuk --- common/avb_verify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/avb_verify.c b/common/avb_verify.c index 20e35ade3029..e6f3f207ff6f 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -176,7 +176,7 @@ static int avb_find_dm_args(char **args, char *str) if (!str) return -1; - for (i = 0; i < AVB_MAX_ARGS, args[i]; ++i) { + for (i = 0; i < AVB_MAX_ARGS && args[i]; ++i) { if (strstr(args[i], str)) return i; } From patchwork Tue Aug 14 00:43:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 957324 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="qH/Fa9T4"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41qDT16dfzz9s7c for ; Tue, 14 Aug 2018 10:47:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AD2A8C21CB6; Tue, 14 Aug 2018 00:44:37 +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=FREEMAIL_FROM, 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 352D1C21E39; Tue, 14 Aug 2018 00:44:15 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 65939C21DE8; Tue, 14 Aug 2018 00:43:58 +0000 (UTC) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by lists.denx.de (Postfix) with ESMTPS id F0654C21E1B for ; Tue, 14 Aug 2018 00:43:54 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id q8-v6so10537038wmq.4 for ; Mon, 13 Aug 2018 17:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PcnDMiDj8NCAsbmHT6JdJ1TpwonRFpx0cn8KLYKa5UA=; b=qH/Fa9T4BCf1zKPx3DeYEsZCG/aGd3bm63N5fS0HoGsIoa9gDp2C5WhSLfELswdiER DOTEnFvJDTZQdzQTbDJSsl7IxEyervR0/08xlGgrK5MfSqvxRJApDPrY19EfJx48+1E+ cU+38U+5VMaw6bVuLnOZRuFle/eyiazj/si7ZOaGbakPeZPbcLsreLWg4OSVWQqRqjjH 6r9U3bxU3Zb6pet0XcAiuJcCRKEb4TydeB0uerOu/99EmYUij+baP5CzoOGHqZlGLJX5 zFJfYs+NENtZ1bIHteoG6gQ9tBJ/tziYwFhuiV5/8giemLjNRbNrhF2Aih6WaAeG+S1u ehzA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=PcnDMiDj8NCAsbmHT6JdJ1TpwonRFpx0cn8KLYKa5UA=; b=Z9gFEpPTjslGTiqZXrADVeo3BYcb7pBTtPWnBt5ssYobkcXBVQRCf8DeFsfabB00E6 RfWRNoegoXRT3NH9KRk79AGJKdwoupfL4pfm6kqT88ZEA8rvIMCF1eBelWDnGxlas30O XG75vHDfrMD1jowBljsbPk4oBJGYXkX7ByhhJr0pA2GYF7v3taj/RyM5z3Aau59UkOfX 9qD3h5KkGvVCvF/vkQ+nW6E0CvWGuVmwpEY5ruRM1XgBUdDhvlEw/7AdaRxCdbvp8AtL XAYJq2XnJOfffZXOu3cHDmsR9b8T/i5rzzexUv41mDrNKBx+LYDV4bnnyX0DXJateIHB 2O/Q== X-Gm-Message-State: AOUpUlEy2jeb2Yb1gltUHsp3uzpHZTWzBBwsVvHhxAKXjOFlOgLJdKCO ZyKcdR7y3Ep6I2EPF3ggAN8= X-Google-Smtp-Source: AA+uWPzrbakEFgHiR5Am1u9N58seMAw/HI2YT+RCHEdOCzWLZB6E0NaJloAHzi4IbIPU/CSdt1HK6g== X-Received: by 2002:a1c:910f:: with SMTP id t15-v6mr9931343wmd.51.1534207434685; Mon, 13 Aug 2018 17:43:54 -0700 (PDT) Received: from localhost.localdomain (ipb218f402.dynamic.kabel-deutschland.de. [178.24.244.2]) by smtp.gmail.com with ESMTPSA id 66-v6sm23832576wmw.34.2018.08.13.17.43.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Aug 2018 17:43:53 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Igor Opaniuk , u-boot@lists.denx.de Date: Tue, 14 Aug 2018 02:43:05 +0200 Message-Id: <20180814004309.15271-3-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180814004309.15271-1-erosca@de.adit-jv.com> References: <20180814004309.15271-1-erosca@de.adit-jv.com> MIME-Version: 1.0 Cc: Eugeniu Rosca Subject: [U-Boot] [PATCH 3/7] common: kconfig: Mark AVB_VERIFY as dependent on PARTITION_UUIDS 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" Avoid below compiler [1] errors, reproduced with configuration [2]: common/avb_verify.c: In function ‘get_unique_guid_for_partition’: common/avb_verify.c:692:31: error: ‘disk_partition_t {aka struct disk_partition}’ has no member named ‘uuid’ uuid_size = sizeof(part->info.uuid); ^ common/avb_verify.c:696:29: error: ‘disk_partition_t {aka struct disk_partition}’ has no member named ‘uuid’ memcpy(guid_buf, part->info.uuid, uuid_size); ^ LD drivers/built-in.o make[2]: *** [scripts/Makefile.build:278: common/avb_verify.o] Error 1 [1] aarch64-linux-gnu-gcc (Linaro GCC 7.2-2017.11) [2] r8a7795_ulcb_defconfig, plus: CONFIG_AVB_VERIFY=y CONFIG_PARTITION_UUIDS=y CONFIG_UDP_FUNCTION_FASTBOOT=y CONFIG_LIBAVB=y Signed-off-by: Eugeniu Rosca Reviewed-by: Igor Opaniuk --- common/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/common/Kconfig b/common/Kconfig index 4d7215a36086..f48888a0e03b 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -640,6 +640,7 @@ config HASH config AVB_VERIFY bool "Build Android Verified Boot operations" depends on LIBAVB && FASTBOOT + depends on PARTITION_UUIDS help This option enables compilation of bootloader-dependent operations, used by Android Verified Boot 2.0 library (libavb). Includes: From patchwork Tue Aug 14 00:43:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 957320 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kzKN50rc"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41qDPy2Dw3z9s7c for ; Tue, 14 Aug 2018 10:44:38 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id E4345C21E13; Tue, 14 Aug 2018 00:44:18 +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=FREEMAIL_FROM, 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 C4BDBC21DE8; Tue, 14 Aug 2018 00:44:11 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 56913C21E12; Tue, 14 Aug 2018 00:44:04 +0000 (UTC) Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by lists.denx.de (Postfix) with ESMTPS id 5DC71C21E16 for ; Tue, 14 Aug 2018 00:44:00 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id w24-v6so10482897wmc.1 for ; Mon, 13 Aug 2018 17:44:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tRVm0VhVsMFpmdGkuTonr75LtdPb3Z0SUfSIzA6XwjQ=; b=kzKN50rcG/rJTEugkobCVHHqC4jVGv+ChHd7a0N4iJThm6nIfnJuISjYfMnyHH5iDj XXPhBV6lyqQMTR54rQt3VCDZinGk25mIrgFpRLO3zQM1U29WTyW+zmhr5+sRxwWeYF3w GHMFYLqqqKp7daI02gLfBpqZWiNXWbOq1FH4v2v2B2QDldBcYBTZhM31C4+q/yEmNSmK 0PI8FEbI3ACoI0IcyikQS/sMdA+AqUyYbBAXL/lPM9wUlFqgt/MSi+LHBwLLozEO5oqK do2MjtWzelD2XQCSloR3YmPaHjmUGHnJYkybb4LxV4g89ZXsqR1Db9B2hgCVI6aKDEO7 khSw== 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:in-reply-to :references; bh=tRVm0VhVsMFpmdGkuTonr75LtdPb3Z0SUfSIzA6XwjQ=; b=e/suqGnWii0xohiE2alQnLJFAZzLqCeBPOCm5WHwiQhuXxA6OW0ywSCqlq84fZz7wX edIRh4crnxFOjlgcj2QOMhjuk+frl+nglfw/gc8zS2j9v3WDDq6dTz9cu7I1bsBBJRmY 10JEFllafs6xxqX+BYxPPMm2VnQuWBbAivHxJXFpsJTORMrL5RWMKKjUQZpcbosLTIkC dzoujUEC3W4vt5o6Q06dT/Q/5RA1iG/xqnaLH6gNEvTxy8g27mISuZNYz1ZM+4Lrz4YG Oz2o24nmJGAmyz8zZudEMUWuwx3rdgzNstYarcHUi4yYV2l1J2mUdpZdPsfah89JbUSQ ip8w== X-Gm-Message-State: AOUpUlHxtIOjqoNnjTQDBB9zJTu53Q9VWDjgHA6tIFz+GeRWFuArh1Rq PDvNOdURp0Nc4C9ZDsSfQQU= X-Google-Smtp-Source: AA+uWPx/lcxJEekJxAJLcV7wid4TqTkH1jUuwEl9RW3lwldbnlRWVc5uboec3iV1EORuXsRPlSMQvg== X-Received: by 2002:a1c:f60c:: with SMTP id w12-v6mr9041237wmc.80.1534207440073; Mon, 13 Aug 2018 17:44:00 -0700 (PDT) Received: from localhost.localdomain (ipb218f402.dynamic.kabel-deutschland.de. [178.24.244.2]) by smtp.gmail.com with ESMTPSA id 66-v6sm23832576wmw.34.2018.08.13.17.43.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Aug 2018 17:43:59 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Igor Opaniuk , u-boot@lists.denx.de Date: Tue, 14 Aug 2018 02:43:06 +0200 Message-Id: <20180814004309.15271-4-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180814004309.15271-1-erosca@de.adit-jv.com> References: <20180814004309.15271-1-erosca@de.adit-jv.com> Cc: Eugeniu Rosca Subject: [U-Boot] [PATCH 4/7] common: avb_verify: Make local data static 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Fix sparse complaint: common/avb_verify.c:14:21: warning: \ symbol 'avb_root_pub' was not declared. Should it be static? Signed-off-by: Eugeniu Rosca Reviewed-by: Igor Opaniuk --- common/avb_verify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/avb_verify.c b/common/avb_verify.c index e6f3f207ff6f..9c90e1b4ae5c 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -11,7 +11,7 @@ #include #include -const unsigned char avb_root_pub[1032] = { +static const unsigned char avb_root_pub[1032] = { 0x0, 0x0, 0x10, 0x0, 0x55, 0xd9, 0x4, 0xad, 0xd8, 0x4, 0xaf, 0xe3, 0xd3, 0x84, 0x6c, 0x7e, 0xd, 0x89, 0x3d, 0xc2, 0x8c, 0xd3, 0x12, 0x55, 0xe9, 0x62, 0xc9, 0xf1, 0xf, 0x5e, From patchwork Tue Aug 14 00:43:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 957321 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ch0KUOjM"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41qDRM0GZHz9s7c for ; Tue, 14 Aug 2018 10:45:50 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 9DAD4C21DC1; Tue, 14 Aug 2018 00:45:24 +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=FREEMAIL_FROM, 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 6FFADC21DD7; Tue, 14 Aug 2018 00:45:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A86AFC21E15; Tue, 14 Aug 2018 00:44:10 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id 4AD4EC21E26 for ; Tue, 14 Aug 2018 00:44:06 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id l2-v6so9030603wme.1 for ; Mon, 13 Aug 2018 17:44:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Zst6l6GxAHLoFWybbtQLDQO0bfRKFL90sdDuSIPhBX0=; b=Ch0KUOjMB4/Xng4Mm64VB/TB2bDmTqU4dWyAGUwn9XFBVzYiWh7f4CwLfUzdRqmjIm oysrok829eiJnqggiCOJyr1aeCl73TIHteT0m4qQicecCGRpb+rW3VHz7YD2IlpulBC/ nBlI3vtQR+t3ZBJDIyCBPjfBq1wSTDTwJsYeXfYQ3UOmqjM8knRHoRf/mV2kpOK9c9wP 3/qG/Q0VqRMPmqQyVp38XMLzilkesD50ky77TBPn2+PHxAuakdl+m41DgWZjeewM+Aj/ OKeXrEvb33YwVMpCyhRV8mx0TrQnEEHKIHtk0+c5uOksovvE1mGgOf7NFJ7PYHJ9qtlJ H+IQ== 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:in-reply-to :references; bh=Zst6l6GxAHLoFWybbtQLDQO0bfRKFL90sdDuSIPhBX0=; b=sNADwTrmlnHH50hL2xosxoeQITjIuodyfxrpFGB4bv4ZJbCqcNZmVHAVbMSj+aisCO ZBkrygXadp+8OMv0ExmOhYUBm69QhXliUObolXOJSdDZt4x7f3rAJFNCqw20Q+luIWgs UKi7WDkfEr2ltWRizyHu7xWaqh4jbAj9lKHuIxTe032UnJ636qAcJL+IhVaKxzzB9Tc+ vXrmetX2pkwnuSlY+NFkPpmwcSX8MsPnJcKBsOBcGv/g73mUOFVMXQYlL4XHuHBRWtAC FogsPX8BfFMkmRXoOI48PnBWXdx13y8t2rhubTKQRqVGwFmmKC7A5tWlXKJ1VCqWCjyf 08PA== X-Gm-Message-State: AOUpUlH7qBtolMUALdjp1KeiQNUs23IQq/v/8LQtkGqcjbD4ynkNskwL 1VKpZKBfnMaW7gHfZFowJOM= X-Google-Smtp-Source: AA+uWPw+/nR8dqodcYWlMAUCx/Ww5on/10g6MQGxcyiXgYsrW1wyZMKG9Yty0QXSWTVRSYLCWnIa5A== X-Received: by 2002:a1c:57c1:: with SMTP id l184-v6mr9475687wmb.16.1534207445988; Mon, 13 Aug 2018 17:44:05 -0700 (PDT) Received: from localhost.localdomain (ipb218f402.dynamic.kabel-deutschland.de. [178.24.244.2]) by smtp.gmail.com with ESMTPSA id 66-v6sm23832576wmw.34.2018.08.13.17.44.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Aug 2018 17:44:05 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Igor Opaniuk , u-boot@lists.denx.de Date: Tue, 14 Aug 2018 02:43:07 +0200 Message-Id: <20180814004309.15271-5-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180814004309.15271-1-erosca@de.adit-jv.com> References: <20180814004309.15271-1-erosca@de.adit-jv.com> Cc: Eugeniu Rosca Subject: [U-Boot] [PATCH 5/7] common: avb_verify: Fix memory leaks 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Cppcheck (v1.85) reports w/o this patch: [common/avb_verify.c:351]: (error) Memory leak: part [common/avb_verify.c:356]: (error) Memory leak: part [common/avb_verify.c:361]: (error) Memory leak: part [common/avb_verify.c:366]: (error) Memory leak: part Signed-off-by: Eugeniu Rosca Reviewed-by: Igor Opaniuk --- common/avb_verify.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/common/avb_verify.c b/common/avb_verify.c index 9c90e1b4ae5c..58cfa1aa7de8 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -348,34 +348,37 @@ static struct mmc_part *get_partition(AvbOps *ops, const char *partition) part->mmc = find_mmc_device(dev_num); if (!part->mmc) { printf("No MMC device at slot %x\n", dev_num); - return NULL; + goto err; } if (mmc_init(part->mmc)) { printf("MMC initialization failed\n"); - return NULL; + goto err; } ret = mmc_switch_part(part->mmc, part_num); if (ret) - return NULL; + goto err; mmc_blk = mmc_get_blk_desc(part->mmc); if (!mmc_blk) { printf("Error - failed to obtain block descriptor\n"); - return NULL; + goto err; } ret = part_get_info_by_name(mmc_blk, partition, &part->info); if (!ret) { printf("Can't find partition '%s'\n", partition); - return NULL; + goto err; } part->dev_num = dev_num; part->mmc_blk = mmc_blk; return part; +err: + free(part); + return NULL; } static AvbIOResult mmc_byte_io(AvbOps *ops, From patchwork Tue Aug 14 00:43:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 957322 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HTwKnePD"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41qDRc21gLz9s7c for ; Tue, 14 Aug 2018 10:46:04 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 04031C21E31; Tue, 14 Aug 2018 00:45:06 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 63407C21E0B; Tue, 14 Aug 2018 00:45:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A89A5C21DC1; Tue, 14 Aug 2018 00:44:15 +0000 (UTC) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by lists.denx.de (Postfix) with ESMTPS id 16E44C21DC1 for ; Tue, 14 Aug 2018 00:44:12 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id r16-v6so15705535wrt.11 for ; Mon, 13 Aug 2018 17:44:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lVp/BwnbLvYt0mybwRwUmchZe3PqEeQUiU2dgoRLcbk=; b=HTwKnePDcn4zbDl0ls8Lzq8iEQIvbx+QsD2igxswmxIDNq6u+/K4n8t1tsRxSKL0oL gfBz0pBROJaGYzrh6RlTsP4W+4QOGF5p94dDoVQZ0L125mliBqe0boLGxkiyLlRQCZFu pyaLgaXl7xjIwyTkG8XUC09nM8ltVtL29wb7VLj7dIP8oyyCPw3kOBaEWUXll9H1dp2V 0GQ2z8K0+iDpoebFQ1VL3lwQQZSd17E6dcbkMb5aP/LSNdY6n0BeXRb9UtmY9gIFmXTA hs5tTXkUM7ATP6ibM0Ii0S/1v8fxYXs1UyJ26ED4KroBx2fzOB5EIsCUxccm76ab6NPs kEHQ== 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:in-reply-to :references; bh=lVp/BwnbLvYt0mybwRwUmchZe3PqEeQUiU2dgoRLcbk=; b=czHPz1e4aIpV55AuNEw1tTYugaxio9enk0Sf33tz8VTPLtXKbsxtIDu6H0Obz1pSRF Oy1/zJOMgpAxOt8lfyNTy3cNq+y3H0a1509jFffNoR82wNOOHRRn+e357M67KS9ArhWC dPvf7mDZL9CSaxppOoCl6Ii/Wl13LstqQiyYXTlfbE5ayAeM2rKLXRvVz7lIpzWkvAP1 kik+GuHS5ndFR+YPUlJRB2umkMVX4pmpg7KuYZ0PXkhKNcqfXOHyDyk9pSJR07ucqzOz T+nFHSKGg/E9uu6ldCqIcm+F8bmQqdX9p4JADIK3pEOIKqCvxvnx7631lAE1z11MFX9Z vA4A== X-Gm-Message-State: AOUpUlHqLtJ6SZrFA0Ia5LbVy9qKy28eNwQtSYEQNYUEgzECsIaakNfB IdYzm4uwqMka2OWxFUfNXXU= X-Google-Smtp-Source: AA+uWPxIi5LditIqp47O+78O6R/3jBJO+m5kfoxIxMUQfhjxusLniSGbCEHtNzjET4V1XCgigMoZzQ== X-Received: by 2002:adf:b309:: with SMTP id j9-v6mr12305501wrd.207.1534207451800; Mon, 13 Aug 2018 17:44:11 -0700 (PDT) Received: from localhost.localdomain (ipb218f402.dynamic.kabel-deutschland.de. [178.24.244.2]) by smtp.gmail.com with ESMTPSA id 66-v6sm23832576wmw.34.2018.08.13.17.44.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Aug 2018 17:44:11 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Igor Opaniuk , u-boot@lists.denx.de Date: Tue, 14 Aug 2018 02:43:08 +0200 Message-Id: <20180814004309.15271-6-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180814004309.15271-1-erosca@de.adit-jv.com> References: <20180814004309.15271-1-erosca@de.adit-jv.com> Cc: Eugeniu Rosca Subject: [U-Boot] [PATCH 6/7] common: avb_verify: Fix never-occurring avb_free(ops_data) 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Cppcheck (v1.85) reports w/o this patch: [common/avb_verify.c:738] -> [common/avb_verify.c:741]: (warning) \ Either the condition 'ops' is redundant or there is possible null \ pointer dereference: ops. Signed-off-by: Eugeniu Rosca Reviewed-by: Igor Opaniuk --- common/avb_verify.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/avb_verify.c b/common/avb_verify.c index 58cfa1aa7de8..3d2b4cbad92d 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -735,7 +735,7 @@ void avb_ops_free(AvbOps *ops) { struct AvbOpsData *ops_data; - if (ops) + if (!ops) return; ops_data = ops->user_data; From patchwork Tue Aug 14 00:43:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugeniu Rosca X-Patchwork-Id: 957323 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ORYKNZgu"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41qDST14Wsz9s8f for ; Tue, 14 Aug 2018 10:46:48 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B2453C21E3A; Tue, 14 Aug 2018 00:45:46 +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=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, 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 87B81C21DD4; Tue, 14 Aug 2018 00:45:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6E280C21E08; Tue, 14 Aug 2018 00:44:18 +0000 (UTC) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by lists.denx.de (Postfix) with ESMTPS id 8148EC21DFF for ; Tue, 14 Aug 2018 00:44:15 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id v14-v6so15733608wro.5 for ; Mon, 13 Aug 2018 17:44:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ry3t8jDnEiX41BjT0SaoYlf1zMSta/6v7xx0XeGJL3c=; b=ORYKNZguvHW52MmWOzZCBkGKUejWnIX6UQ6jmL+/Go5h060vbF5L17GCghtppamQdp 5aa/x1f6W1r9P5TRBb00rqO3Fs79VrOwBP1y5ZNQfCpys6bYIYuApJS/WsbJu3h3eEXq OZVx1A1RMqhdHzTH1V5Unpt7mBPvhW6nG00s5ZGy5GgiGj4jgipxKJnvABHFygWZlTyb pQu6OZfB0tF1/BBzOVjxjrZrVLAsrri0cjiuGw/4qxNC7LB5gKZJykWJjY6AuVV9X6ZN Fz2eM5TUGT7Rooud4OcLnKvEyTDuUZH8g/MqTF2z0RwmLc5vej1IYqysGpw61y78KSec vGAQ== 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:in-reply-to :references; bh=Ry3t8jDnEiX41BjT0SaoYlf1zMSta/6v7xx0XeGJL3c=; b=QvatP4gFbC+vtJvrR8oGxa81EFWV9w/s8LVwr9oi3A8aVj032a0sP9RulCBuxhNWdT wZZjmqSRSpB9UYhDD8q2F5VvcL7oXRyj/K1uq+vxju7FhjKzy9RVUUptPkB/O/kll8e+ npsqZNnpcAvXFwIWJ1ZP/y/5yyzS+rtwfCx+WczYBM5imHnvIz6PBXgNDkAJnlqkqYti O9+7vT4T//uJuhI533RfwxxRXb0WbJa10bW/KE7Hyg7697DMp12prIsD5KasKpkytb1k cdOd1KZp5LBcJ9uyE6rBmVYnlcHQ1hjGm+uP0RzMeG+Jr70D6FlEgmc63bP+XCB/LsaU YQcw== X-Gm-Message-State: AOUpUlGbDFOyM1kNjvivfeGj0tGERt/N22i4cj6mde2vtjIubMiwXWei pp9TljvzPdTVPqoRDH1Hxis= X-Google-Smtp-Source: AA+uWPy8ggmIXNMCM6TTljGRs/SV17NZoiaa2Ku++3tnHQblFYIlDubScemD8oHtYHRNg+kTMj6TbA== X-Received: by 2002:adf:b3d7:: with SMTP id x23-v6mr11929163wrd.253.1534207455223; Mon, 13 Aug 2018 17:44:15 -0700 (PDT) Received: from localhost.localdomain (ipb218f402.dynamic.kabel-deutschland.de. [178.24.244.2]) by smtp.gmail.com with ESMTPSA id 66-v6sm23832576wmw.34.2018.08.13.17.44.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Aug 2018 17:44:14 -0700 (PDT) From: Eugeniu Rosca X-Google-Original-From: Eugeniu Rosca To: Igor Opaniuk , u-boot@lists.denx.de Date: Tue, 14 Aug 2018 02:43:09 +0200 Message-Id: <20180814004309.15271-7-erosca@de.adit-jv.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180814004309.15271-1-erosca@de.adit-jv.com> References: <20180814004309.15271-1-erosca@de.adit-jv.com> Cc: Eugeniu Rosca Subject: [U-Boot] [PATCH 7/7] common: avb_verify: Fix division by zero in mmc_byte_io() 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: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Compiling U-Boot with ubsan/asan libraries and running it in sandbox may lead to below backtrace: => avb init 0 => avb verify ## Android Verified Boot 2.0 version 1.1.0 read_is_device_unlocked not supported yet common/avb_verify.c:407:31: runtime error: division by zero AddressSanitizer:DEADLYSIGNAL Reviewed-by: Igor Opaniuk ================================================================= ==9388==ERROR: AddressSanitizer: FPE on unknown address 0x0000004b467f \ (pc 0x0000004b467f bp 0x000000000000 sp 0x7ffd899fe150 T0) #0 0x4b467e in mmc_byte_io common/avb_verify.c:407 #1 0x4b4c47 in mmc_byte_io common/avb_verify.c:532 #2 0x4b4c47 in read_from_partition common/avb_verify.c:533 #3 0x69dc0d in load_and_verify_vbmeta lib/libavb/avb_slot_verify.c:560 #4 0x6a1ee6 in avb_slot_verify lib/libavb/avb_slot_verify.c:1139 #5 0x45dabd in do_avb_verify_part cmd/avb.c:245 #6 0x4af77c in cmd_call common/command.c:499 #7 0x4af77c in cmd_process common/command.c:538 #8 0x46bafc in run_pipe_real common/cli_hush.c:1677 #9 0x46bafc in run_list_real common/cli_hush.c:1875 #10 0x46c780 in run_list common/cli_hush.c:2024 #11 0x46c780 in parse_stream_outer common/cli_hush.c:3216 #12 0x46d34b in parse_file_outer common/cli_hush.c:3299 #13 0x4ad609 in cli_loop common/cli.c:217 #14 0x4625ae in main_loop common/main.c:65 #15 0x46f2d1 in run_main_loop common/board_r.c:648 #16 0x640253 in initcall_run_list lib/initcall.c:30 #17 0x46f9d0 in board_init_r common/board_r.c:879 #18 0x40539b in main arch/sandbox/cpu/start.c:321 #19 0x7fa94925f82f in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x2082f) #20 0x408908 in _start (/srv/R/u-boot-master/u-boot+0x408908) AddressSanitizer can not provide additional info. SUMMARY: AddressSanitizer: FPE common/avb_verify.c:407 in mmc_byte_io ==9388==ABORTING Signed-off-by: Eugeniu Rosca --- common/avb_verify.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/avb_verify.c b/common/avb_verify.c index 3d2b4cbad92d..759df7bd25c0 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -402,6 +402,9 @@ static AvbIOResult mmc_byte_io(AvbOps *ops, if (!part) return AVB_IO_RESULT_ERROR_NO_SUCH_PARTITION; + if (!part->info.blksz) + return AVB_IO_RESULT_ERROR_IO; + start_offset = calc_offset(part, offset); while (num_bytes) { start_sector = start_offset / part->info.blksz;