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.8 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,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 31908C4338F for ; Sun, 1 Aug 2021 12:47:28 +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 6EEDE610D1 for ; Sun, 1 Aug 2021 12:47:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6EEDE610D1 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 041078328E; Sun, 1 Aug 2021 14:47:25 +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="mTkiFJLU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 589E3832C0; Sun, 1 Aug 2021 14:32:02 +0200 (CEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1f::60d]) (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 E4D69832B7 for ; Sun, 1 Aug 2021 14:31:58 +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=C56NXtJzXY+bAgfqYHw44tz17s37w7hyqeZZb9E5+1JGQn7QgWjizUbczwbGBa4wd0NO8EERkOU+igEi14H+fuU69tv8huQgYAF/Lq0ChqA7DyfTVtS1H17dRaQ7Re3Rw3Ec9pXBy3clWjJGMcMqHLlhcljG3IR0zkJU0xk1HBPvjp25LAL5mVqWMerE0Xx5yhFs0V+aRUuTjSqCK5KRQwGLVFTB9sVPqn+V88d6yRtoIWRn1PsRUAtYLEz1E9gV86dZcOA+Td1SORKJNS1BykL1p2NK4SkfabLAJek8pRf+xM9cXjlJC/ONv94lPzFJh12RVsl0QpjTyURvwinh5g== 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=jf+74pfBKiIp8eoQXDKuY9rXXHWeMmFi+N8/H/IfirA=; b=UprKQhukgU1b/3v6LNXCOkYC6M1UeWstf29yxrhOjlw86ydQ0UaHlpJdfgmF5ddcTEtVqFGoosXzzX9wWCZww6Z/b86RQSIB5lBQ+OZXAXvs1AVslvSQb0jrOUpsZbx9YrkrEp2NB7CBo9kn1kZmkOdyNcHexB73ZofG4pnDtf699nlFCDa98qrpaNGyw6xJ9NWzDcOyPz1kLzAlg4zIq1VYPQ4L0TezDZEu5jinlsCyhWY5Q45EEDofCip0S4MZ64Wd3FZINJIlTR/kwP+7Gsyx01ytdD9dMIb1HzLUFeZhMdbS1wx9k+8YMRJfTnA96cdwuqIgpwhbLm6/hvZIjA== 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=jf+74pfBKiIp8eoQXDKuY9rXXHWeMmFi+N8/H/IfirA=; b=mTkiFJLUJdY/u59/pfBIi2yS18COZUxqPSgXpTpsfg0Yyx+7TEukyVHFprA2SzO8GuYdnmHNZctNXnwzetXnuW11JzuBSp0wS78OcDdreW3M70HuK1XuuCnGug3fzfYIfSomyqHlGkNRPCFzGSiWeB73tSn65QY8zA4VANCSZzg= 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 DB7PR04MB4010.eurprd04.prod.outlook.com (2603:10a6:5:21::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.21; Sun, 1 Aug 2021 12:31:57 +0000 Received: from DBBPR04MB7820.eurprd04.prod.outlook.com ([fe80::658a:de87:ea0b:e49d]) by DBBPR04MB7820.eurprd04.prod.outlook.com ([fe80::658a:de87:ea0b:e49d%8]) with mapi id 15.20.4373.026; Sun, 1 Aug 2021 12:31:57 +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: Sun, 1 Aug 2021 14:31:45 +0200 Message-Id: <20210801123145.2711525-1-kshitiz.varshney@nxp.com> X-Mailer: git-send-email 2.25.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: AM0PR01CA0098.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::39) 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 AM0PR01CA0098.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Sun, 1 Aug 2021 12:31:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa2bbc52-d973-4ba5-08b8-08d954e85a6e X-MS-TrafficTypeDiagnostic: DB7PR04MB4010: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O2w8yScLxijdT3Fk/INulf1+WQs9op6o4QpHsrctwE7qRu5WWbndDNxpMYYOOn0VVexuDo2yIHN297Tgg3/aB7XeRQuGsH96vHVSwNoDQgMNCDU/Pwd4HcQwE4dckjl8S9qmdZL7HwVld2De2MW6ftT9m53twjexORyje5G8sRBHzfMHXYK+pTBueXpCU2Okwixet3y1lS0ZuPcFhJXrkyRD29kZopL3LwvFBvnE5CUqK5Ng84IEzhCTR0dq/ZeK+W0ChZf9F2+QBgx58lflwUxBhCh2yWiqfm7n01rqDAjpqssMI/V2cDuhOt5Ytny9+xeKb99RYpKn5NgmvASxLWQKXiX7Chjv5/LQVk2WUf4kSCWM7R79k94hctDCHOC7+RaReyAXNTzFRkFhDHi9Qhkv0puueVfEQCJINMwAwO2Pl2wTol0HZE6HhAkMLwuCfWyJjgB37ACs5/cf7uz7IRwxvF9N7LOpfgq6qCpQmFoGv3IRzlLyn5YX9oPBeklRWOiVcTFGo7HO1U98Jg+5nkh3LyACoMMoibecA9fI+YZMG/ftRg50+zXF+ImBHKXJO7Deo4ceKUOUhhzEf2nHDjFGtnswoTVtJvlS4VChlSnl4cgIlgKWwhmTQwQz+Am/WgCSmHM17IQvKz27lX6r1cNJ96Zog1kSBjLcNkxG4BvJ7OiPokG+AuN+2bMZfC91SQqGyrpfIFCncXn7AQDlVQ== 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)(346002)(366004)(39860400002)(396003)(376002)(136003)(6666004)(7696005)(478600001)(5660300002)(6862004)(86362001)(66556008)(83380400001)(66476007)(956004)(44832011)(8676002)(52116002)(2616005)(316002)(36756003)(37006003)(2906002)(38100700002)(1076003)(66946007)(8936002)(186003)(6636002)(26005)(38350700002)(4326008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+0hdU6QGeKeYFGY1LTbvyUbqHfmLOcKp5jMVO9EXly3VZWGf9SmIEkZzcw0+?= =?us-ascii?Q?e/6b50JFBvat9iBQUwo9fbMAeOTFU099s+j8Fx1zI/SwVkUwvSYjnDji/NyA?= =?us-ascii?Q?G/Yi4sOrpGteJoXCmIeCh/PFDv/iO6rI/E5Kn/HYnLv4P1Z3504qfC2HrckH?= =?us-ascii?Q?i6wrAt4ZSu9TY16ZxL6G1aKrV2HmwQkLj1iZFqouI4FqR64Y1LhaTLmFluZh?= =?us-ascii?Q?1h1cJLtt1lvrF95zeX0iWNfmuczaBli+kHgqeRYfn3lUdhjq/Fl3GZKZaz/0?= =?us-ascii?Q?Jn0Ww8hwWhMe9ssi5oqYPfDkoH/cq3CPn0gEhMhUzdQaglCrx/sPupQyZy2P?= =?us-ascii?Q?GwMwB8CdbWLdWyPOpy+2SyQk3aPDF+JWw+As9wW2DdVJgDBQ9cPexaSamizH?= =?us-ascii?Q?yv6E07BzBzg87Ks5AdvfuxbFX6r7xre+5q963H+/3meoXqzCZwy9G0r6Y0nx?= =?us-ascii?Q?P335CFuQV0dR8Cme8WcMhAt3OBcKRtg+MinnD/vJwCzP3ffYm3hpSC2BYhsv?= =?us-ascii?Q?T6hXJOziheD5crHe00JuaTyZ1iWaLyGvrhkiLicyGgVSEaDGFILMz4G5pp4v?= =?us-ascii?Q?C5SNEyr2xjb4b044XxG3bEvko3Y8gYHIbmb++soe00MlCldMo+F4hZFbDmJD?= =?us-ascii?Q?ecttf2gjUmmjHPKxKX6rbxczjPBcLVGSoirOGuOyMc8f/zSgBIq/CXAVmLCI?= =?us-ascii?Q?QgRPxqIXk6oiTByRsNz4ypknFdkUDxezYpBpnhiwGRhBkrYSyzV/QsCGOOT/?= =?us-ascii?Q?BCELl3WROjna647s/oogUzDDSg3ohHUXLfjEPNHqAHhA+nzd0pE+EbD/5OYD?= =?us-ascii?Q?Tqy/E8A471bDvL+QtcjVT+EHZQmp7L8nJw5hOpCr+P5+ELCqgRw9KnWTao9n?= =?us-ascii?Q?+aZ5sp0TyBfzfvVVRjLMtI1ovOSpT86WgAmeHpysjHPrlIyuWYqlNyfDcxUE?= =?us-ascii?Q?Fklf9jWPvgPLq2lyqg+clK7Z7hb5RAlFo1xMV0ctI3V55It43QKmPYUql0sq?= =?us-ascii?Q?CAiRfC5BjFRu5xcgUDokelK5TsYtwGAA2p6yfaUWTJKW3Bla13NsrGnpi4sj?= =?us-ascii?Q?21S+NCGo6Pjbh4NjttMZCjm5vrK2DY9Y4mmDD4mxCd8PTPus75bXUNxKHL8Q?= =?us-ascii?Q?WDGTON1Qq5R8icTsOuVG9Ope94t7wtm7svPBIlrHRfHE2nhFym91cc/Ctis2?= =?us-ascii?Q?VWNfkz5fgXwwZ9pfZhQ782Eqt4viXDeyFbVFHHOH4XGc+WONxP19poruzTYN?= =?us-ascii?Q?JJbu9bGp3vbZYx8Q1swAECoqZ5cvytcZn5E46tWCcDCEaGfEaR1GuPSr9bE2?= =?us-ascii?Q?ddU2GLhGWVsf6keN4vu6h2pD?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: aa2bbc52-d973-4ba5-08b8-08d954e85a6e X-MS-Exchange-CrossTenant-AuthSource: DBBPR04MB7820.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2021 12:31:57.7127 (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: vVoUIM297qOXdBoSGmIbWc2PwjjFnjXeNqcKu676DJY8VFxXUfCatLHs6Qt6GWwDiSP5LqT4EYDWpD/upzZRn2jtb4IpZWCHayvB37qLsYc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4010 X-Mailman-Approved-At: Sun, 01 Aug 2021 14:47:24 +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() and calc_esbchdr_esbc_hash() function. Verified the secure boot changes using ls1046afrwy board. Signed-off-by: Kshitiz Varshney --- board/freescale/common/fsl_validate.c | 36 ++++++++++++++++++++------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index 564a8b3b54..5cec0131f2 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -498,8 +499,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 +522,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]; @@ -547,14 +554,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 +592,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