From 4d39f905f595fbff1702366f080a05ba2a1a4e67 Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Fri, 29 Apr 2022 12:39:44 +0100 Subject: [PATCH] UPSTREAM: firmware: arm_ffa: Remove incorrect assignment of driver_data The ffa core driver currently assigns its own driver information to individual ffa device driver_data which is wrong. Firstly, it leaks this core driver information to individual ffa_device and hence to ffa_driver. Secondly the ffa_device driver_data is for use by individual ffa_driver and not for this core driver managing all those devices. Bug: 254441685 Link: https://lore.kernel.org/r/20220429113946.2087145-2-sudeep.holla@arm.com Fixes: d0c0bce83122 ("firmware: arm_ffa: Setup in-kernel users of FFA partitions") Signed-off-by: Sudeep Holla (cherry picked from commit 00512d2930b338fdd42bd90bbd1793fe212c2d31) Signed-off-by: Lee Jones Change-Id: Id4853e2cb6ce3856861134545bd7db9d51c97b9a --- drivers/firmware/arm_ffa/driver.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/firmware/arm_ffa/driver.c b/drivers/firmware/arm_ffa/driver.c index d3d53fbd3d29..bed57b9147fe 100644 --- a/drivers/firmware/arm_ffa/driver.c +++ b/drivers/firmware/arm_ffa/driver.c @@ -607,8 +607,6 @@ static void ffa_setup_partitions(void) __func__, tpbuf->id); continue; } - - ffa_dev_set_drvdata(ffa_dev, drv_info); } kfree(pbuf); }