Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates
 149.199.62.198 as permitted sender) receiver=protection.outlook.com;
 client-ip=149.199.62.198; helo=xsj-pvapexch02.xlnx.xilinx.com;
Envelope-to: tejas.patel@xilinx.com,
 michal.simek@xilinx.com,
 amit.sunil.dhamne@xilinx.com,
 rajan.vaja@xilinx.com,
 linux-kernel@vger.kernel.org,
 linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] drivers: firmware: xilinx: Fix dereferencing freed memory
To:     Rajan Vaja <rajan.vaja@xilinx.com>, <amit.sunil.dhamne@xilinx.com>,
        <michal.simek@xilinx.com>
CC:     <linux-arm-kernel@lists.infradead.org>,
        <linux-kernel@vger.kernel.org>,
        Tejas Patel <tejas.patel@xilinx.com>
References: <1612765883-22018-1-git-send-email-rajan.vaja@xilinx.com>
From:   Michal Simek <michal.simek@xilinx.com>
Message-ID: <7385a404-a627-2ab3-50b3-b4807bb3b387@xilinx.com>
Date:   Fri, 12 Feb 2021 15:12:04 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.7.1
MIME-Version: 1.0
In-Reply-To: <1612765883-22018-1-git-send-email-rajan.vaja@xilinx.com>
Content-Type: text/plain; charset="utf-8"
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Feb 2021 14:12:06.9603
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 86d34b35-66cb-440c-3a9c-08d8cf602e1d
X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c;Ip=[149.199.62.198];Helo=[xsj-pvapexch02.xlnx.xilinx.com]
X-MS-Exchange-CrossTenant-AuthSource: SN1NAM02FT055.eop-nam02.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR02MB4361
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 2/8/21 7:31 AM, Rajan Vaja wrote:
> From: Tejas Patel <tejas.patel@xilinx.com>
> 
> Fix smatch warning:
> drivers/firmware/xilinx/zynqmp.c:1288 zynqmp_firmware_remove()
> error: dereferencing freed memory 'feature_data'
> 
> Use hash_for_each_safe for safe removal of hash entry.
> 
> Fixes: acfdd18591ea ("firmware: xilinx: Use hash-table for api feature check")
> Reported-by: kernel test robot <lkp@intel.com>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Tejas Patel <tejas.patel@xilinx.com>
> Signed-off-by: Rajan Vaja <rajan.vaja@xilinx.com>
> ---
>  drivers/firmware/xilinx/zynqmp.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/firmware/xilinx/zynqmp.c b/drivers/firmware/xilinx/zynqmp.c
> index 7eb9958..83082e2 100644
> --- a/drivers/firmware/xilinx/zynqmp.c
> +++ b/drivers/firmware/xilinx/zynqmp.c
> @@ -2,7 +2,7 @@
>  /*
>   * Xilinx Zynq MPSoC Firmware layer
>   *
> - *  Copyright (C) 2014-2020 Xilinx, Inc.
> + *  Copyright (C) 2014-2021 Xilinx, Inc.
>   *
>   *  Michal Simek <michal.simek@xilinx.com>
>   *  Davorin Mista <davorin.mista@aggios.com>
> @@ -1280,12 +1280,13 @@ static int zynqmp_firmware_probe(struct platform_device *pdev)
>  static int zynqmp_firmware_remove(struct platform_device *pdev)
>  {
>  	struct pm_api_feature_data *feature_data;
> +	struct hlist_node *tmp;
>  	int i;
>  
>  	mfd_remove_devices(&pdev->dev);
>  	zynqmp_pm_api_debugfs_exit();
>  
> -	hash_for_each(pm_api_features_map, i, feature_data, hentry) {
> +	hash_for_each_safe(pm_api_features_map, i, tmp, feature_data, hentry) {
>  		hash_del(&feature_data->hentry);
>  		kfree(feature_data);
>  	}
> 

Applied.

Thanks,
Michal