From patchwork Tue Nov 24 15:15:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe REYNES X-Patchwork-Id: 1405608 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=softathome.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=softathome1.onmicrosoft.com header.i=@softathome1.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-softathome1-onmicrosoft-com header.b=K8rBBsn5; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CgSJQ22mnz9sSf for ; Wed, 25 Nov 2020 02:15:34 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1F89E825D0; Tue, 24 Nov 2020 16:15:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=softathome.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=softathome1.onmicrosoft.com header.i=@softathome1.onmicrosoft.com header.b="K8rBBsn5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F1ED2825DF; Tue, 24 Nov 2020 16:15:25 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from FRA01-PR2-obe.outbound.protection.outlook.com (mail-pr2fra01on0616.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e18::616]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 30987825C4 for ; Tue, 24 Nov 2020 16:15:23 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=softathome.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=philippe.reynes@softathome.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ca3kEdZqvB7C4akX2BSJy1nTAzPMAe8nrcZSEu7WdE/+dfR+LAoc2VgqMtIyky5xfsgqzI+RO9QTsvsvP3AyApp/WTnVFHSCJgwggrbqu0xNZ0eUB7pnGfjv5l+ESX2gA7nZixtE423lMsb+niHJJcTsx/wT4VPVa02eKDis8QfmXYImiFCVdIdKUl1wjlB+jkmlr3iB05NchAlXlUarFzy0NsYpo8zUkKpGemd4AVIsHrCbG2/3dpf9wMgDun4QuuD8jkZoYexwxKAQQfYpP0/OMsUIFAqTAe8kepX1sDmB9yHBkCXJOegOi97t7/axFSOA8gpRa/2lsmn5lG4QHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=km4SR+Zm6zay/lKsJuxzG9HjRBLGeQOaPxOo67WMFag=; b=HjMJ3wU/qSvTbAsxKYvg3z1/MjES1DUzu4IyJDrgV2RpMqS4kz681MlfPp0oBvL7DI4mWcMUNUMqfCwlWqP9QK+CMWSPul9N47BezFAikI8E/xBoJNbsE/d7l5/b1znl9TjPITY7aBbt8edVrtRdhzGtfaijMNCKBnJmBoLAPE1JxbQnCjKZE8DA46MsEfHUjFaz+L2fQosmRszz5YNNkeYru2HH1vjOMC/P6tue0daN6JmzosZpSkplNDw3e7rBpGkHx2Nxj4auK01h6Pl9lyauk16qxHQZVdx9/Qhy1FDapgD2ml0ETpmt82F8BB+Rq8xlHnfxzaUPeJs6uxHL+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=softathome.com; dmarc=pass action=none header.from=softathome.com; dkim=pass header.d=softathome.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=softathome1.onmicrosoft.com; s=selector1-softathome1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=km4SR+Zm6zay/lKsJuxzG9HjRBLGeQOaPxOo67WMFag=; b=K8rBBsn51LzVNbnniItGECVjVwIi0ClXkNEYtX84X9FcMHwPHdiDqCb0DI/90jC2uoaD5k0Acj8zfzgkQiOGm3+wa/qu7r+/Go7wMBSh8unJd7cPdwOeB85Sq651ETZUtS+PyPhA7O/BrWrLS1f8oQBiYs1X4WvHoV1k/tXR1REXyVeyKJJx142/Kt/Akd4e5mnoqn8iedbzw1oNa49OFUY4AsP85sZk92Mj6ZdnEXO/HUDos+CeSEQuENinp9LCKEqyMu1UV74lk//ZHoSPeuHed3VfKsh3x6B9IwYxrbESIPWgpYjmhqMMRnb6ae1zev0PD3UuNO60v0Zw0L1/hg== Authentication-Results: chromium.org; dkim=none (message not signed) header.d=none;chromium.org; dmarc=none action=none header.from=softathome.com; Received: from MR2P264MB0068.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:5::16) by MRXP264MB0245.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:1f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.28; Tue, 24 Nov 2020 15:15:19 +0000 Received: from MR2P264MB0068.FRAP264.PROD.OUTLOOK.COM ([fe80::d1bd:61ca:31ea:7a5]) by MR2P264MB0068.FRAP264.PROD.OUTLOOK.COM ([fe80::d1bd:61ca:31ea:7a5%7]) with mapi id 15.20.3589.022; Tue, 24 Nov 2020 15:15:19 +0000 From: Philippe Reynes To: sjg@chromium.org Cc: u-boot@lists.denx.de, Philippe Reynes Subject: [PATCH] common: spl: spl_fit.c: report an error on hash check fail Date: Tue, 24 Nov 2020 16:15:05 +0100 Message-Id: <20201124151505.4782-1-philippe.reynes@softathome.com> X-Mailer: git-send-email 2.17.1 X-Originating-IP: [2a01:cb08:1b9:9600:4551:b305:2d73:bdb4] X-ClientProxiedBy: PR3P193CA0015.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:50::20) To MR2P264MB0068.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:5::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a01:cb08:1b9:9600:4551:b305:2d73:bdb4) by PR3P193CA0015.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:50::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3589.28 via Frontend Transport; Tue, 24 Nov 2020 15:15:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9f8d9ba0-5250-48e3-746b-08d8908bc159 X-MS-TrafficTypeDiagnostic: MRXP264MB0245: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:46; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WuFnNyFXox3VOeb/a3JGRBMmEJqfayTLTunKsQrJiB0C0cdXa29QUWPjhhhJ0YPeBF8JtpN53rQW9zpG6QmWiTV/8qQ3WxxHNvw4dbAM0/JEpF7+3NLfI00iwz5h8iYp/401ciDaB8Gxlsur5m2YRQCfYxsstB+BT8T0FqUk7zwu8pahq3xGudWEnv1jtvd4uzF0c3Iz/UFaQyZEuXbyIhQ6L+JOiziSWnjVrMRxjUz+YrDHWxfMA0cLDnUj4ej9Gn28ZU68jmJk/RKdJAPq44+93z+wzy5KfLNecGyxQGQL7rRiNqmNUS91SE7NVwB3l9RbH9DdK7IaWbGjly5/c+tJw21yjqjRwHfPVIwCxlkG4dKeKrSuFTHzQxw9qUKG X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MR2P264MB0068.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(4636009)(396003)(136003)(39850400004)(366004)(376002)(346002)(6916009)(8676002)(36756003)(6666004)(478600001)(107886003)(2906002)(316002)(44832011)(83380400001)(6506007)(8936002)(52116002)(4744005)(6486002)(66476007)(86362001)(69590400008)(16526019)(66946007)(66556008)(6512007)(2616005)(1076003)(186003)(4326008)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: FwvnoKUebaRct/9gsQl9nsExVJq4A5i6nBrKiYONjzAc2W5VWsrWckqJZdrIIY3dqkhP/WS77DssroQpgdUrqjsyxOEaL35/uqnhKCzg3Qa05oYiZtzD3ibbyF0vXUQ5Tqm/1T6hmzl4JrFn3WynmJKwbuDrro7tKbu5o/dUyuP2/VrybY6v3kr5SZjSGvs91nixWbpSiya3DTUB88ju8C0h4SQNF+HB3H442N3a0WueB510gvptW2mi5z7lxga5bEVScOeQdIYcyFcEwlWk3ZZSNhv24L3Zy9QXdP2AR3MrB4GiiJ40GxLa8pTE8wbCrkcq8tJgL2hByJgLMVT4ngtuyb9LYmBn/2yJ5nd2+Y3BLOviGHNXbgmIcF7mMfk5DmFMjsXBvd6paVaDg3IJ+8DS6SLVQpOtnRWr+mXDqkaHeU2utrIa1P7WFQRDLhmNIRjfCmoQfWyWWmLJUkLClxlXfbgzvPAr9n6GamA/n5B/rILwYK4Nx81OT4NPXKvdpQylNJZVZCAuP/feGUm/S/LH31o3i7GxSY5J3UBKwvxSxE0yY9GKBMKl+iYq5Y9JzniRF+aCUShz4QF+y3YVtWArFhuO2VpDmgRYUb9KRK85y9xHhd97dsncBDllA1ja4yExS7wnNE0yQgNi00st+XNmPzmH6F1ZjEG7717vRuC8byMRideDuzIQ1GvuhoaqUTd7PjkSa35RbvSDpW1iieauGkP89ic67frn9EJtGDY5ozUF8gFj+Ay/0Mr4E3lnGO4IwB2ZyqP5l5HFhoc7qo7xqWgJmeLLiM4th2/r8ZApxcnnHGD7WwUXlnJSATaE/87QiiU39CA68GLVlRy/yrinEGES61oYflpOB8w5VGf8UNCye3x+spIxW8kK4xUCqVvs+VmRcjsw0NPXNilSNuT78VXYzpprr/x8x9GPOiYtWIpdmNvNJ5dXtuzXA+IuFXzthNttpljB+RsslaqK4Q== X-OriginatorOrg: softathome.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9f8d9ba0-5250-48e3-746b-08d8908bc159 X-MS-Exchange-CrossTenant-AuthSource: MR2P264MB0068.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2020 15:15:19.4352 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: aa10e044-e405-4c10-8353-36b4d0cce511 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: i85eI7Q+khJzpitJqr+OfdHaDoIfeB8miGLLyG9KGjv8J+wWuF2iir+FBPMinGamU7C17l2Nh0TfDfk6TaMB+Qk5qUN/2hCd3LVx3dSZ0jE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MRXP264MB0245 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean When the hash check fails on a loadable image, the SPL/TPL simply jump to the next one. This commit changes this behaviour, when the hash check fails on a loadable image, the function spl_load_simple_fit stops and report an error. Signed-off-by: Philippe Reynes Reviewed-by: Simon Glass --- common/spl/spl_fit.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 6418062b93..0de4a2b543 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -667,8 +667,11 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, ret = spl_load_fit_image(info, sector, fit, base_offset, node, &image_info); - if (ret < 0) - continue; + if (ret < 0) { + printf("%s: can't load image loadables index %d (ret = %d)\n", + __func__, index, ret); + return ret; + } if (!spl_fit_image_get_os(fit, node, &os_type)) debug("Loadable is %s\n", genimg_get_os_name(os_type));