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 4FA7EC4338F for ; Fri, 23 Jul 2021 23:28:59 +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 60EDF600D3 for ; Fri, 23 Jul 2021 23:28:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 60EDF600D3 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 044D682DE7; Sat, 24 Jul 2021 01:28:47 +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="MPN5SpRB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6102082C92; Fri, 23 Jul 2021 15:15:54 +0200 (CEST) Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on061d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::61d]) (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 704C982C92 for ; Fri, 23 Jul 2021 15:15:49 +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=cJWIsBKyxCMsTnnKv/0MFvYQUsqJ/nkecTxbtHqO/vYg9dolJTjfqWO71cqOYJvzqNn8g4F2N5fA5D1fF1sNdjPMM2oAkLgk56Gd4aGgT2iId+dAZP4nPBgrtMvv5eF8hb4+lg7iFca2sw9DPHB+gWT8P1DYxB6pcY6tt2FtwTR3obHzkVBh1fdsEmD1ZIqgF6mwe7yPfYtZIDZCLbRTOQY9wpIILDCdVYzsGyZ1RR2dNrmjLbw+IFuz8IdUnyt0tu3XH6SUZV/7nILovV8+w+jzB5pooue4sn5kC5BVKO7dVPlljiSPSguFJdGuTmDx4y4eb3hMgpdh+VrkeFwtzg== 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=UqJCTOcIuPE7l5HPtTsNXelL6mlO6NhtmmlukUva218=; b=Vo2NMsHNzpyzmTIipCs1kbC+zg3KBf4CrsJmByUEZymdsaAHMutL1PloglSVIjtcVzm6CoLlEQaj7JBctVhMoxnUWPwBJv+6KiON/+Ukr2YT9vC4L1qrlj8dvOeR0/e/NMRKWbDSPzM+t5OX7okrWbbBFpFWeKK7En9I+mVX5bxZuwJKz1vNBb6V3XzsXw3TyB/l1IxVTfTZvFVKFkcdnZOcBozFaYnYsCZZfOxeTNCEEWKl5FKgOzygiMug0GusracLL9cMtxW08J4GkYBh416K9luStjrLnsWSYSD51KqYlRm0KkvyRKi3PKLG1J5BRf0S0bfrs4JiM/ElJ/V5RQ== 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=UqJCTOcIuPE7l5HPtTsNXelL6mlO6NhtmmlukUva218=; b=MPN5SpRBJT5wLAWuEg2XBif+SXKFEfB5P5CK4wJ/oy822mJB6XcR3u2yE3cYdUKXL0dHUypD3SAKoeXW0wtpmlg5j0W3BqeQgzCr3rFtfKV7koFfcucRGjSzXf6iNRcj8LUAiCqZG4+VsEZFLV555xaDjMXn6HsPkpKNLhNduJ8= 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 DBBPR04MB7820.eurprd04.prod.outlook.com (2603:10a6:10:1ec::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.28; Fri, 23 Jul 2021 13:15:48 +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:15:48 +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:15:30 +0200 Message-Id: <20210723131530.410040-1-kshitiz.varshney@nxp.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) 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 AM0P190CA0016.EURP190.PROD.OUTLOOK.COM (2603:10a6:208:190::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.25 via Frontend Transport; Fri, 23 Jul 2021 13:15:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b856931-3e43-4fad-dd43-08d94ddbfcb8 X-MS-TrafficTypeDiagnostic: DBBPR04MB7820: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XlPydQ4gwGlLJrWT45JJkGDSqKDt7AzDHlUGqi77qzvgTqb3xg22yaPwPnGnMZ4Dr0wcbJQOYNfJ0lDZg8JTCGKLNc+MVmGMuTeDlce5pF8QM9KSXnfCumG7aXzdnoGtwVQcShTSup/MUJ+Wpjb79EIlrFDwC/jE3NbyEmq8AbS7sL4UQdaSKtDgqNlpfnpucq/3uYDZwtjXZsR6BxekzHahG458KLwf4DxThPkj3Ck4WLFowTa4yyEqPS2s+0vrSl3Hg+uVFZfQbwNpGtB/W3ajeti1l/cRi3VqxxOGLPxPsebHsth+q1vuW8fY9zJxi9co4C8I/8zjwibogEemooT4+RWOkH4r+GEaBnf7K6UN7LB7JiT694CFmjQwh42aZYNdEFA30YqPjMHE2I0Fbm6b3gl0xtFLx4+GQ6g1ew7jB7BB60k6Ja5pOzxI2pY7YGXNbYz5l53jeTfSJsA3Tw2xIR/MTl6NaM7iBt9OXlzEc9hxhUf2z2wAIzmAhF50zKe5kb/N3a3oWrsacaUFwxH6fnqLk8myBaaO1hiHQ9T/wnyMLPPyw9FUIUSD1dDUJxfmAvUH2FP6Sl4CvBpo5Hv5wmDFx8vCvFyzokJyjhIszkeOFnLk/mV528LHr4zdCSYp/RmQejYzj5HGRmrrRZQoc/golblcXHtz4c+y2o7d3jOt+huBVfQOpZatgh0wAClkPL36MDPyebtI/36MUA== 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)(136003)(39860400002)(366004)(376002)(396003)(346002)(44832011)(6486002)(26005)(186003)(6862004)(66946007)(2616005)(5660300002)(66476007)(4326008)(37006003)(38100700002)(7696005)(36756003)(66556008)(52116002)(478600001)(38350700002)(316002)(1076003)(956004)(86362001)(83380400001)(2906002)(6636002)(8676002)(6666004)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EhThUhrL6Rvk0MmVdhPHAXRMQzz138afM+xXvA/ggoIncV0hKnEU1rwQWh/X?= =?us-ascii?Q?zcOgUowZ+GWIVAOv/6e2oUAIPWky7MXl/sheWoPhzKjM8H7benFozP1g/0Pc?= =?us-ascii?Q?a+xAZ4/bj29+f27kKd3VikDhsJidXolj+O3BzhNDQ6fjxPfJzBaIQhdEqiYq?= =?us-ascii?Q?gxbU6OUUiKUWvOkMFvZpPPtUjHftyGeug1uI2oHBTcSBfFarZFUi5ADFF+t5?= =?us-ascii?Q?Fuy8wZb5gvGxHZZrhS5NHANXQuW4G5ga2DGwyA2AE9Z9/OuENWkjp/sPAUfU?= =?us-ascii?Q?M+1SPaj07IPYOI8Bw8tSW3sP0Mno1MQ+CFRclj2NjQkXpI9cfcEY1e69FupE?= =?us-ascii?Q?vOjm57KeZbf92+XuHsnMX2GYwIxFljDMO0/TV4YxXaXOsBQoo2M9catgTyER?= =?us-ascii?Q?ZFE5P69FQ8V/i79O9VK6/YWHMOrdfwWJxcI05VBIwK1QhfwfZsjfu7hxYe3b?= =?us-ascii?Q?1VipR0HD8tDBorklgkgqr4cgNNsGj7VLSmAbQb9E9KeXAzZBdWiXHXYpZ8EX?= =?us-ascii?Q?z/TPYFfLVYripNe3uJwmZJXw6fYtLv4YNJEeZkH2kLRWy3fcuFjXCpNoRcer?= =?us-ascii?Q?GZ0AF0XIQeyYY8LCzqMx0+YS0kcbaRSaZ4Pmych7uM+vHdRo7uyDS/0Y9hUr?= =?us-ascii?Q?dbvfC3t+Bed2phPUuhDeel6ruTJfK1Iy5rYp250V9faH1C6JApatIy3Y3JFa?= =?us-ascii?Q?IhFwPiQT2Iw+fn2Y5B9dcH8Cg4wqD5wkPfUHCFxTv6mCSlAyktvhSgvYPJkp?= =?us-ascii?Q?reW7hEBX7emdnfu5Z7BMzaT0/CZ5OS1ZGVANkt/0Q/WRvOF4FsineIvSmNQd?= =?us-ascii?Q?DkpygX36aVoig8pr6xPfMz78VjqUXFE6SGBVXsylZA5aslvZXSfS5hY11fEt?= =?us-ascii?Q?1z5OotDs6v/GNWNh8feSNaJldwNEukFwJM3s56+Qd9N7xYYzAtfhOMGoNnQo?= =?us-ascii?Q?rRYY4kg0wnujcvcL/G1pX0VtucN/XIEjvvQicQbM/Je3KVLVp3fqh1cg10kU?= =?us-ascii?Q?h5XlNluaNFK3PkEQtX+qa388pRJ5phhcrufpJJgHE4rVGcd8LQyHQes7ctti?= =?us-ascii?Q?dE2enaY/0oxebcU3Ke03Te2GotD4qzc6OgqxCYY7eDs5rLGCEkak1EbjFAlp?= =?us-ascii?Q?2B3IUxfGGJC+zC3egsvqJgeaB2AydAnNbsBEoJYOU28uBj94rilpBQepVHlp?= =?us-ascii?Q?z24mkqwZmC3ZuagO1zRVrPGXcX297oYuFjYA57PIFHuAkT9lZX0w7vsH2F4H?= =?us-ascii?Q?PKmKwiGLF6KcldWqhEgwrestrc+0Q0T9o+6eGbQ23YzbTC14iED+FBjZNPcD?= =?us-ascii?Q?UYEU/EzvKFuQ8TU9etCCfb+z?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b856931-3e43-4fad-dd43-08d94ddbfcb8 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:15:48.4130 (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: 3ALN7cb8CHx/O3CNwHs0ZfHrUPMQ7MBZv92zFQyDcozH2ZjnO5EqoHTmJ1GwYJcYU/OopesNMMB1B38Ax8XaPKLoQbx/82aSRqXxyN1hFg4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7820 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_img_key_hash() function. Verified the secure boot changes using ls1046afrwy board. Signed-off-by: Kshitiz Varshney --- board/freescale/common/fsl_validate.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index 564a8b3b54..d553bd88a0 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -498,8 +498,11 @@ static int calc_img_key_hash(struct fsl_secboot_img_priv *img) return ret; ret = algo->hash_init(algo, &ctx); - if (ret) + if (ret) { + if (ctx) + free(ctx); return ret; + } /* Update hash for ESBC key */ #ifdef CONFIG_KEY_REVOCATION @@ -518,8 +521,11 @@ static int calc_img_key_hash(struct fsl_secboot_img_priv *img) /* Copy hash at destination buffer */ ret = algo->hash_finish(algo, ctx, hash_val, algo->digest_size); - if (ret) + if (ret) { + if (ctx) + free(ctx); return ret; + } for (i = 0; i < SHA256_BYTES; i++) img->img_key_hash[i] = hash_val[i]; -- 2.25.1