Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0B35C4338F for ; Fri, 23 Jul 2021 23:29:09 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 37C96600D3 for ; Fri, 23 Jul 2021 23:29:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 37C96600D3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8111A82E4A; Sat, 24 Jul 2021 01:28:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="F46uTpYM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E011B82DB1; Fri, 23 Jul 2021 15:48:16 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20619.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::619]) (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 5118B82D7E for ; Fri, 23 Jul 2021 15:48:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kshitiz.varshney@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gJH/cKSno7l9KHkD80oKR7X8175OWyhokhzyL3WtkOdlKRxlcB2DEyUwA/UqgEXMoWrElxrMxfoUD43oDIlGgUeVhVX3vUBnSqyS7Fr9M5xR+yf920RNf2h8w9lDXzRq90mCYI5gtm8WKr/+/c9eMk3cnzBNIKjD3Vdzdt952BH7/HlSuFTPWrg7uXWIHSEsXSgu1265FIVHxnLaxr5o7OWLBYjYrpMQhkNrFFUdYbgpSVJiSz1RniaqawLfMXl9rKvub8iltaRyTVmUjKtPBojye82RSqCPDO7IHdiLU3m3uEUVK4bo7s3F5L7MLT1YjcQCRIC6/xargkVWBLGn/A== 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=vG6wUdKeKznfMrNCU+MU+otSNoyY/9Uusf+hTlfWkkQ=; b=Bhhx8PCSVrLpnnTEwuVfro4D5M8LPn5iwoNzWiAtN9krRLMWQs4ZmeRt0vrWMRIknoJo8Qd0VxKjFergWXo1zeAlzDSdD45ng1T8l0bLzuXNuHbk64rMcwt9WIN6ryFOqvZnVgn1W7l5GA+HNPFGW3k4BzhmknzK77E8qzxnCrPDLRiLuX0bqgHbCVZxh8EjDLWsN0f5WQI06ZUPwm2j1m6g3t23jGGoG1KED3B9+LviJpfsOKcQL7Jd7IR4eYPMq7WsDGQHS/5x7BW0dw8U/74tHikEDdZM5Dm/nksKeA4+XTLs5+Yy/phar8A5pMCq56WuIqLeMhN51HuRmX508w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vG6wUdKeKznfMrNCU+MU+otSNoyY/9Uusf+hTlfWkkQ=; b=F46uTpYMGykSLXfoSy5DYBcHw1Bx3xcUZ5Jb8+rsAfN1plo+38s+aA1oamqUE3NEnQdk9quAVFCzUNU/5AJKCdLv1A6yQhpHtoB/r5KW+JqqY/Oebmb6e+VFX5QUpqSxCHrK6/TSc040v/d2gNfznA/rzZM6UatOY+SYEeyFMSI= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=nxp.com; Received: from DBBPR04MB7820.eurprd04.prod.outlook.com (2603:10a6:10:1ec::12) by DBBPR04MB7867.eurprd04.prod.outlook.com (2603:10a6:10:1e5::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.24; Fri, 23 Jul 2021 13:48:07 +0000 Received: from DBBPR04MB7820.eurprd04.prod.outlook.com ([fe80::658a:de87:ea0b:e49d]) by DBBPR04MB7820.eurprd04.prod.outlook.com ([fe80::658a:de87:ea0b:e49d%7]) with mapi id 15.20.4352.029; Fri, 23 Jul 2021 13:48:07 +0000 From: Kshitiz Varshney To: u-boot@lists.denx.de, Priyanka Jain Cc: Kshitiz Varshney Subject: [PATCH] board: fsl_validate: Fix resource leak issue Date: Fri, 23 Jul 2021 15:47:32 +0200 Message-Id: <20210723134732.422543-1-kshitiz.varshney@nxp.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: AM0PR02CA0139.eurprd02.prod.outlook.com (2603:10a6:20b:28d::6) To DBBPR04MB7820.eurprd04.prod.outlook.com (2603:10a6:10:1ec::12) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv05369.swis.nl-cdc01.nxp.com (92.121.36.4) by AM0PR02CA0139.eurprd02.prod.outlook.com (2603:10a6:20b:28d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.24 via Frontend Transport; Fri, 23 Jul 2021 13:48:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2e43c776-8935-4ed0-c485-08d94de08060 X-MS-TrafficTypeDiagnostic: DBBPR04MB7867: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kT6aQ/jEyZ/zjr4KISm9XHgopPUinBD5RhZErvCTKi47co5IgU7Zg7QQh5kt1O+GMPebKtUUqgtcwcwsnNXFtRaxaHuuAT2NtVpGMtaat8UBiJF4PyAoOOaC3btrFH9wzPV0DQuWwfiVPg4K8MWeMVw/RXwyjz6DPA9XIWreMEsdRxJoRlrJBVBoXyJCAtdzWE6+lVKRkoRzHR9CdyCelAbcbq4YBmZwdt5JE6t7bz2fz28frrBzQeItsPi/BnLdPAV8OwSSaleysj/Gtw+UXqhesN6UUs20He1wTwK5m86lSMBwHG8IJbLWuzg1TdHS0yvi9vWwukAlQlOV78fdLbFsQ/fNEBnwLevqjIxKPISjPEMeDgQNWOHaYhXnBBPgLrbSkPWD/y9lnR8GbLj4DpuSWun5N1hUW+jO7Q/LY6Bykl2QRl09wa9G+purfUeuhF5ofuW8q3yKTtKKeJS/fd0z6xWLJPjFJtW/UKLaRt0j/5nXfjwx+2+2GZk60N3X5oNJouSNtlQ9kpWQgDNH7VYNw8uvaTmaPvg9JpHpYFRfIMsRSO+iV1Zo6Bed5Y3GGhEaP53HQO+q3ZI1GxsQGyPzpNDqAWpOzosjd2/mN3Nq+AajdYWpO0A9IAgBt/uQ7//NHfS27PKP/BF1cnHUTfOnmDKvCWih/PXCPgJSDaqxDZxflx6wdKCo7kEojzbOWOMA1A6vQPzDbCucw/4sSA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR04MB7820.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(396003)(39860400002)(136003)(346002)(366004)(6636002)(478600001)(956004)(83380400001)(1076003)(316002)(37006003)(7696005)(2616005)(4326008)(5660300002)(2906002)(44832011)(52116002)(6862004)(36756003)(8936002)(86362001)(6486002)(8676002)(6666004)(38100700002)(66946007)(186003)(66476007)(66556008)(38350700002)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?zCk9tOe242VV+qZroQ1h6iRvgPoZopH5vQudzwlJs6HdP5JglA97g1dA5tqi?= =?us-ascii?Q?avWwEaDAsRzXzpxK84HZcGGPG0Dl35zE+IRPdIgVx/a8CNUw1cktGCOC0L1s?= =?us-ascii?Q?v92I4UcmKljoh/dEa5+/9WiItFxd4HokvnDOBV71mmIAv31LSpq5YNd6HeCn?= =?us-ascii?Q?AjMTHLnhenkB6hbkmMe0/vYrxSCqiWNH7PCMKnmuOJQd5o2LEb0wblsDVUGW?= =?us-ascii?Q?CYQxE1D+1My5HoIR+b/dY0H2BxW8a2KnpwrYu3g8g+uksWvLMlSSTdGkYj6+?= =?us-ascii?Q?pQc8juZ/B8Mx8vGFOeb/t00cqZZT+COLhIKx+uzl6tIaBr4HY1U/TKqA2e18?= =?us-ascii?Q?dYPwGywFA1nbRmvoVFgZknREtL3iuaN0CZN/lb5G/E4cCcngZ0G5LNKoUIDh?= =?us-ascii?Q?ER0Q1A74cKd4rAvgbOvopP5E44Idz5oUzGXjbjK7hIduCpPTlo4pui3CKKMI?= =?us-ascii?Q?Wp5dWyDkbWk49ig59w+QUBLv//btvM7faA/US7Gd6JYuhf25WhYWMAIITt/W?= =?us-ascii?Q?lvWtvdB0aNIRb0MXYolZIVcPdenn4PJSAXYKlAwskxCAp7V9t7stShFFuDgm?= =?us-ascii?Q?4Di1Vw1tFTPAhtyJOAA14EEDiDdzfs0p+YOjqx0rA8/6m4QnwU5ZBUXsyy9y?= =?us-ascii?Q?dteP7kkr1wcq5fHtOfDko6y1wVqjMLECuWyipMlgH5nztW45EkFj21kJxrjL?= =?us-ascii?Q?4A21OvE+rsSmnMQg2xpsvDOdZ2fSnfm/Cmd86a8//Q/+kuhfRsuaq5WStx0Y?= =?us-ascii?Q?2lVKLzb0xagS0zeLeU18MihvF66mO4YE2foLpZoF1gYPAJ6ANzK7hBIWS1mI?= =?us-ascii?Q?WeB2bSeapBf+RYejDsnl6arM9dW+bJKciKbWh9Mw1STveAJ4e8mF+zyT6/Ri?= =?us-ascii?Q?EUVIRJDS6vr9p/pA5ULAI+iFNJVDtTBWIfyjcBI85rirvzdxlNZ5hZjRZHBq?= =?us-ascii?Q?z+1a10yEWSfel8lzHlxN8VkzxUHKtZDz1yvW57ZGIT3vy0rpiuTnsYqLYa0L?= =?us-ascii?Q?xbK5nC27SpfUHBRnRoHon+h6Y3JmIT7bUKzesZrEtB3+Y+1tXs6Atw+Rkyim?= =?us-ascii?Q?A7f68jY7SB5k+fsW9hD6dDgsFgcNsDy2IxD4WqgdlsZa0hG7EiH/XyhJvXX1?= =?us-ascii?Q?xUZ3335pK8fm23agM/bBJA3N2TbF40TSvIX1SJZ0e9h7E1s46snmJNVWrP9R?= =?us-ascii?Q?XLb3oVFCpJbwtIPD+NDAsell1YWjQ39RWSj9pbU3xGbc5evFAKMPf/GkRic/?= =?us-ascii?Q?H45izvRSoGRPdpuX0rAqVxFhnXcPsTUoMQrirBmYu4wbEYfvYoWjO5SJc+nF?= =?us-ascii?Q?Jw3o1aIUzjY1OGWaW7Z8+0DU?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2e43c776-8935-4ed0-c485-08d94de08060 X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB7820.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jul 2021 13:48:07.2589 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NlERgVOulzuoXhfoUqo68ZtJ2nzEf6hh3ZjBinr8HwBBskAfwWd8rGdsALhufJWyNTpfDfbLtAZkk73hLTh4LQzTb/a3plgZHI0PWGSCsoM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7867 X-Mailman-Approved-At: Sat, 24 Jul 2021 01:28:42 +0200 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.103.2 at phobos.denx.de X-Virus-Status: Clean Free dynamically allocated memory before every return statement in calc_esbchdr_esbc_hash() function. Verified the secure boot changes using ls1046afrwy board. Signed-off-by: Kshitiz Varshney --- board/freescale/common/fsl_validate.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index 564a8b3b54..05d9a004e7 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -547,14 +547,18 @@ static int calc_esbchdr_esbc_hash(struct fsl_secboot_img_priv *img) ret = algo->hash_init(algo, &ctx); /* Copy hash at destination buffer */ - if (ret) + if (ret) { + free(ctx); return ret; + } /* Update hash for CSF Header */ ret = algo->hash_update(algo, ctx, (u8 *)&img->hdr, sizeof(struct fsl_secboot_img_hdr), 0); - if (ret) + if (ret) { + free(ctx); return ret; + } /* Update the hash with that of srk table if srk flag is 1 * If IE Table is selected, key is not added in the hash @@ -581,22 +585,29 @@ static int calc_esbchdr_esbc_hash(struct fsl_secboot_img_priv *img) key_hash = 1; } #endif - if (ret) + if (ret) { + free(ctx); return ret; - if (!key_hash) + } + if (!key_hash) { + free(ctx); return ERROR_KEY_TABLE_NOT_FOUND; + } /* Update hash for actual Image */ ret = algo->hash_update(algo, ctx, (u8 *)(*(img->img_addr_ptr)), img->img_size, 1); - if (ret) + if (ret) { + free(ctx); return ret; + } /* Copy hash at destination buffer */ ret = algo->hash_finish(algo, ctx, hash_val, algo->digest_size); - if (ret) + if (ret) { + free(ctx); return ret; - + } return 0; } -- 2.25.1