From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nFalY-0001cr-1B for mharc-grub-devel@gnu.org; Thu, 03 Feb 2022 06:59:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFalV-0001bv-Gj for grub-devel@gnu.org; Thu, 03 Feb 2022 06:59:05 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:27746) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nFalQ-0006vq-1O for grub-devel@gnu.org; Thu, 03 Feb 2022 06:59:02 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 2139ZD6I024816 for ; Thu, 3 Feb 2022 11:58:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : in-reply-to : references : date : message-id : content-type : mime-version; s=corp-2021-07-09; bh=eoQb1nxm9zv3ZesG82Ir0qg+GNLcR/WpMSixy0T4ILs=; b=OQgaOy3v2OnknecgogOF5YDZKK6HtkWFzPYzKi6fvRuws35eVgzUDfh1AkJdzIF21UM4 Huc7NT9lmP6pAVm0qst+OgQct3KSfB83X3zEjCa1Mv34q7Qq/dXjV8vcsBExGXByT4Ev WJTthXDrGmNzmxKCgfYHFYRtl+YzioR/VHqfDg9IAC0kMqZG0WrEmq3uikyqRAdedyaT yMPGJXrtxvsPHmdbZBx6c5381YEwauSweOMjQIn0FffseRRsZQQpSKI6TLo86iphyNxj TgqJ5pkPT5erKmVipL1S8luCRgJffCgm/SVstLLaAK4zGMHdD8rhrd9HLi06+Gr91LAJ og== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3dxjau1707-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 03 Feb 2022 11:58:57 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 213BtqD6020763 for ; Thu, 3 Feb 2022 11:58:48 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2169.outbound.protection.outlook.com [104.47.59.169]) by aserp3030.oracle.com with ESMTP id 3dvumkan7s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 03 Feb 2022 11:58:48 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Z9Q8Ih06QZOOt+SY6x4qpVW++YjG/82bhX2hiwTd2R4RnpeGcBB5BFrVelLmagiQ3GZLcX5M9WfV2RumHFVPw83BcnMI5vD3f1ZJnypA6/Yg9lH9/5w3hM1t9/XGu9cpzdVD1Wx6KebzZU6UVxWx1+5mlyexnU8RSLNRfWX3q6bbx8G0Zvdjsc0tkBz3nJpa6y64c4OEDBdslT5uEJ9IADvzWd/ZpCStinMut139C/YoSQUzMJ9wEka5d+Z9p1XOpZrKWBhC7hZMNa9Ll0ROCddXjMXeowHmLwPeV2UQciaMpvg/DVqo5RxgF4kAC8IXieQ4oxolU21nPo9UjqpHHQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=eoQb1nxm9zv3ZesG82Ir0qg+GNLcR/WpMSixy0T4ILs=; b=gj9D/8vv1OlZ9nD82jklzr88GOALce/OxJHd/R3PdOcHhXpIiN9qx9gSc4JyHk5S5Kn99rVkntzW3nMgqETnIoRPujDPibMvkoRQA3YFcwmpJz9g9tIiMIiRmvkftP4Xtjl7IHTjP1BAIwDulir2Fi+jC4JbLwfKG9XXNCqiG2kFoK3P1mfe0OZr2yUsX+4S6asurT+xfSPtmTLcMUtdwxakmD/l5bUhmIPL1kzqzQChwJGQG1KQLrpnnD8PizKTVgakCRa96z0zjdVg2PT+nwAcVhV7q45ZMyujWQ8anC7oX5TG4kyqJNs3ASZHZO3IYGW4SH3JXAiurKSIADnOXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eoQb1nxm9zv3ZesG82Ir0qg+GNLcR/WpMSixy0T4ILs=; b=Wve4JG0/NatFSXF2aeh0nZmvpXzuDyIkV1jEuZHienR3IO6CXeFPt93HBBt9/cJTPx9PiCFsx9t5+TviIBKYDdDtajZgvPUAdK9Lo3oXnLZ4dd330JtjmpDgjGmAWpR7Wz91gTx1BKV3N7n3aG8fXfjIm7uYwWdZOJIDqMef5mE= Received: from BLAPR10MB5138.namprd10.prod.outlook.com (2603:10b6:208:322::8) by BLAPR10MB4929.namprd10.prod.outlook.com (2603:10b6:208:324::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.11; Thu, 3 Feb 2022 11:58:46 +0000 Received: from BLAPR10MB5138.namprd10.prod.outlook.com ([fe80::e4a5:7c7:1cfd:1bd0]) by BLAPR10MB5138.namprd10.prod.outlook.com ([fe80::e4a5:7c7:1cfd:1bd0%5]) with mapi id 15.20.4951.014; Thu, 3 Feb 2022 11:58:46 +0000 From: Darren Kenny To: Alec Brown , grub-devel@gnu.org Cc: daniel.kiper@oracle.com Subject: Re: [PATCH] affs: Fix resource leaks In-Reply-To: <1643846901-7889-1-git-send-email-alec.r.brown@oracle.com> References: <1643846901-7889-1-git-send-email-alec.r.brown@oracle.com> Date: Thu, 03 Feb 2022 11:58:42 +0000 Message-ID: Content-Type: text/plain X-ClientProxiedBy: DB6PR07CA0109.eurprd07.prod.outlook.com (2603:10a6:6:2c::23) To BLAPR10MB5138.namprd10.prod.outlook.com (2603:10b6:208:322::8) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4827d11b-93ba-43a8-9cc3-08d9e70c8844 X-MS-TrafficTypeDiagnostic: BLAPR10MB4929:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LjT558uQRBbk3k7CbTG/GB5fL64Njuk95HnzHRqZIRaGzsRyWEmzwGf0+g541STMyiCpE2NPES0LpVM6s40UrfG8xAEPyXEkghuWAKKrkLxl4LAD/yzXB7dm2ExLjfmOgUSOOX6Vhvy4BZ4HGeEJfSO5R7ZX4jiNv4EiQ1CozlzLwd5cH/8jzBgc3PJpbmUpsHKbjrgT91UpV4L5kTE5IT5++HbGqt9TqZ96nj62aSy94uoDpQusWo38QWsZgTbME2ySvuwhGUEIdMhuESAtQe4u4yYw3JC9ct8C3/ekZbs+hCVFPmULaWWegoSA8bg6dlkJznFJlF79bq3O5afWx28tj7g1QQH89+tTVcpihMejD3NtInylegyfgfiqKevWJM7wkR7R87AJBm6+aNGbuD1x0f7ZA8FwcUvgXlcASwzH9PokcEfK9T1FdoUlxMmoibr5bRvGdXKnBWSMGvZ31KywzUggbhqeBYrjXwcJUQ/ZXb6IyeAdJSXfOzUMfk2XTuRdvriZZtG51ldck0hJZxkC6xlQ1DCDYsrMkxBFdN0s1W4GGmAQiKl2WaY9DGB06YFaiTU+XZbBTmiimewbb3AHmJzPcE8jUkZB3s27zkhgYlnzqKNMruBjNTtH2S6UTiAYbW4VaXmlkvZJKaEHHeAYsh75Uoy1b8JrgKBoq6BSGV36me/HDFMLhBGGoJ5ekinw30q3ChDbc9bsMSoSlw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BLAPR10MB5138.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(83380400001)(6486002)(36756003)(38350700002)(26005)(316002)(38100700002)(186003)(107886003)(66476007)(508600001)(44832011)(6506007)(52116002)(66556008)(2906002)(5660300002)(2616005)(6512007)(6666004)(8936002)(66946007)(8676002)(4326008)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?GLabuzwhvXsFWNAvot4+ucZI4AkERxJWnopCezs60/TGJmVW0DdmN7P8cGLx?= =?us-ascii?Q?BaEr+/2YCY5EpTy5Flb3YBDku3bAMzkymnr/v+UnwgNgS7k6b7P4VVz5U+wm?= =?us-ascii?Q?kYEXNl3ViuihQ8QO6QsyG8q9v9bGUAMSzzOhq2pREm+jAJgPseIEvSrCJN6V?= =?us-ascii?Q?U5wqRbmmFqZxObKpv0ge5Ubv8cPDVVCky6dryiDXxQ5oMlelkQTz/hMij6Kb?= =?us-ascii?Q?sgWqnKy6AqaJ/dpQXSZoAizycW5nxAnrVHJ8moFXqVBcMr8N9oYRCKqp3riV?= =?us-ascii?Q?JzENzEv/W2hi3FyHYfZ6qO57dDbHacbAfcx/3aSxkUd+4hsKC5KSyyIdDjuZ?= =?us-ascii?Q?ZyOBCd8mfp4DmhbTdM7mFFTYQeUzQcEMyJItLAs9+zqn45GMoiPnrBeGnHYR?= =?us-ascii?Q?HojQ4gBN0zr9vCoO8hDgqTmFVVu+1+gIPmDghq/5O5Vo46tyKXs4pbF7GLx0?= =?us-ascii?Q?ehjTnLZlF4Ll10GVoYNu/xOFRW2dCdYHqVWp6J9R5u+dHVAMDEN37mwOWPFN?= =?us-ascii?Q?o7uTD0DSoJDy24CHGi4F3TOgVmBzf2N6ljMyJs7VUEJG7LMsUau5tjIlYSf1?= =?us-ascii?Q?aGToDDAThyPF1sp+mkzLyGUbYSpXF+xStP4EhaJHLyHg96JOBSrlujWMtOHL?= =?us-ascii?Q?/5C0B2MBICqo3zs0XqmBUWgmruene/yu6PNGOh33+2ZRLRRxUFu0zFowV2W8?= =?us-ascii?Q?G1PH2ZbYLprTxVQF3uxnUpdfnMAi32RjdSe6Wctd90Xx+ZhJBHMAhQPPk21H?= =?us-ascii?Q?wAFDuMi1wU4e8D8zGWsxRM9VEjPrljggzyWQNjCXqh5nYsKbIDYJufX2qUB/?= =?us-ascii?Q?pPEJTiNSKJuNi6cIRlRw+5f8mq0Czgij/uIXhU0ZIHf6un/WuMI8qWShLg9r?= =?us-ascii?Q?MbEGHv18faemYRBglkWNirUIswc4gJOiq2RdVOTsOb5VE3elLvHMoU451TxF?= =?us-ascii?Q?EirO6ud6gdeWc9fqiimvUVXFsvTJPrhy8ae/XRKTBIm+Dd5z0b04nVlAG6vD?= =?us-ascii?Q?MQMh1NLRpXm9cGyjphqR2UpfOBaBR4TW7PBZ7vtmv+mZl/gyAMKWxXHBzxEn?= =?us-ascii?Q?mEw0eo0cMNrV02gQxyZpmuxbZ9NjQVcj1XbWKS9cdY4KmVZnPfVPOZ9DeeZV?= =?us-ascii?Q?gZvqFSqIYM/51X5KYOyJc0c84MVLRzYa48AONsiDDTLhkqpOmJW2TGwivcG8?= =?us-ascii?Q?7kbVB86agVyF2qgZXOZEg4r0eo16z9kGZkOAH6e7z2laR6lvGljrJ2V6VW/e?= =?us-ascii?Q?79eWWuIOKYjLydJgZkqyxULfjnk1cWkiqiQT8ipVPLi1cjwUGJJAw1xh8zlF?= =?us-ascii?Q?Pg9OHGMAPJfgogafROIujyOyJV9gx4z7n1N/kHgRYPWv455wXmj+eAjsNBnW?= =?us-ascii?Q?x6z7WQ3K+E9hIxsBF4qrMp2OuYatiPA2uD+mu/AYh/wiQattlOAm5svM0Cyd?= =?us-ascii?Q?gitB0ew8Vq0UZP/oJfQZvJlM8i6S46EygFE+dAxEzFfQgm2sbf3S6PqfWc71?= =?us-ascii?Q?0VHiYlmrE4IAn2+9GLqZOl5ddf8q2Smxu9msifUD3mKE4fcyBgPpiFmwljau?= =?us-ascii?Q?55ZvyKzxgDUp8LoS2HacMPmf7BSqHINzBj/HDgXyyQbZhMSEVnCKgaAk1uOB?= =?us-ascii?Q?b+sCWzIouz4MjcBx7Bf95Ng=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4827d11b-93ba-43a8-9cc3-08d9e70c8844 X-MS-Exchange-CrossTenant-AuthSource: BLAPR10MB5138.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Feb 2022 11:58:46.3957 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9q+RNmsRRW4il4DIJuFtClStghVMBLOfJFygy+xG9G8H6XbuhialkCGpoEpkN1R/5d9FaJGUjLlXPDGLkNbuWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4929 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10246 signatures=673430 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 phishscore=0 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000 definitions=main-2202030075 X-Proofpoint-GUID: HBV6n2hOmVlzWKuiCtFa5JK2K5hMtBsu X-Proofpoint-ORIG-GUID: HBV6n2hOmVlzWKuiCtFa5JK2K5hMtBsu Received-SPF: pass client-ip=205.220.165.32; envelope-from=darren.kenny@oracle.com; helo=mx0a-00069f02.pphosted.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Feb 2022 11:59:06 -0000 Hi Alec, Don't know how I ended up missing this originally, but thanks for fixing it, so: Reviewed-by: Darren Kenny Thanks, Darren. On Wednesday, 2022-02-02 at 19:08:21 -05, Alec Brown wrote: > In commit 178ac5107389 (affs: Fix memory leaks), fixes were made to > grub_affs_iterate_dir() to prevent memory leaks from occuring after it returns > without freeing node. However, there were still some instances where node was > causing a memory leak when the function returns after calling > grub_affs_create_node(). In this function, new memory is allocated to node but > doesn't get freed until the hook() function is called near the end. Before > hook() is called, node should be freed in grub_affs_create_node() before > returning out of it. > > Fixes: 178ac5107389 (affs: Fix memory leaks) > Fixes: CID 73759 > > Signed-off-by: Alec Brown > --- > grub-core/fs/affs.c | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c > index cafcd0fba..7b9e62064 100644 > --- a/grub-core/fs/affs.c > +++ b/grub-core/fs/affs.c > @@ -370,17 +370,26 @@ grub_affs_create_node (grub_fshelp_node_t dir, > GRUB_DISK_SECTOR_SIZE - GRUB_AFFS_FILE_LOCATION, > sizeof ((*node)->di), (char *) &(*node)->di); > if (err) > - return 1; > + { > + grub_free (*node); > + return 1; > + } > continue; > } > default: > - return 0; > + { > + grub_free (*node); > + return 0; > + } > } > break; > } > > if (nest == 8) > - return 0; > + { > + grub_free (*node); > + return 0; > + } > > type |= GRUB_FSHELP_CASE_INSENSITIVE; > > -- > 2.27.0