Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-17 02:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

firmware: arm_ffa: Fix the race around setting ffa_dev->properties

Browse Source 
Currently, ffa_dev->properties is set after the ffa_device_register()
call return in ffa_setup_partitions(). This could potentially result in
a race where the partition's properties is accessed while probing
struct ffa_device before it is set.

Update the ffa_device_register() to receive ffa_partition_info so all
the data from the partition information received from the firmware can
be updated into the struct ffa_device before the calling device_register()
in ffa_device_register().

Fixes: e781858488b9 ("firmware: arm_ffa: Add initial FFA bus support for device enumeration")
Signed-off-by: Levi Yun <yeoreum.yun@arm.com>
Message-Id: <20241203143109.1030514-2-yeoreum.yun@arm.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
This commit is contained in:
Levi Yun 2024-12-03 14:31:08 +00:00 committed by Sudeep Holla
parent 40384c840e
commit 6fe437cfe2
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/firmware/arm_ffa/bus.c
View File

@ -187,13 +187,18 @@ bool ffa_device_is_valid(struct ffa_device *ffa_dev)
return valid; return valid;
} }
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id, struct ffa_device *
ffa_device_register(const struct ffa_partition_info *part_info,
const struct ffa_ops *ops) const struct ffa_ops *ops)
{ {
int id, ret; int id, ret;
uuid_t uuid;
struct device *dev; struct device *dev;
struct ffa_device *ffa_dev; struct ffa_device *ffa_dev;
if (!part_info)
return NULL;
id = ida_alloc_min(&ffa_bus_id, 1, GFP_KERNEL); id = ida_alloc_min(&ffa_bus_id, 1, GFP_KERNEL);
if (id < 0) if (id < 0)
return NULL; return NULL;
@ -210,9 +215,11 @@ struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id,
dev_set_name(&ffa_dev->dev, "arm-ffa-%d", id); dev_set_name(&ffa_dev->dev, "arm-ffa-%d", id);
ffa_dev->id = id; ffa_dev->id = id;
ffa_dev->vm_id = vm_id; ffa_dev->vm_id = part_info->id;
ffa_dev->properties = part_info->properties;
ffa_dev->ops = ops; ffa_dev->ops = ops;
uuid_copy(&ffa_dev->uuid, uuid); import_uuid(&uuid, (u8 *)part_info->uuid);
uuid_copy(&ffa_dev->uuid, &uuid);
ret = device_register(&ffa_dev->dev); ret = device_register(&ffa_dev->dev);
if (ret) { if (ret) {

7
drivers/firmware/arm_ffa/driver.c
View File

@ -1387,7 +1387,6 @@ static struct notifier_block ffa_bus_nb = {
static int ffa_setup_partitions(void) static int ffa_setup_partitions(void)
{ {
int count, idx, ret; int count, idx, ret;
uuid_t uuid;
struct ffa_device *ffa_dev; struct ffa_device *ffa_dev;
struct ffa_dev_part_info *info; struct ffa_dev_part_info *info;
struct ffa_partition_info *pbuf, *tpbuf; struct ffa_partition_info *pbuf, *tpbuf;
@ -1406,23 +1405,19 @@ static int ffa_setup_partitions(void)
xa_init(&drv_info->partition_info); xa_init(&drv_info->partition_info);
for (idx = 0, tpbuf = pbuf; idx < count; idx++, tpbuf++) { for (idx = 0, tpbuf = pbuf; idx < count; idx++, tpbuf++) {
import_uuid(&uuid, (u8 *)tpbuf->uuid);
/* Note that if the UUID will be uuid_null, that will require /* Note that if the UUID will be uuid_null, that will require
* ffa_bus_notifier() to find the UUID of this partition id * ffa_bus_notifier() to find the UUID of this partition id
* with help of ffa_device_match_uuid(). FF-A v1.1 and above * with help of ffa_device_match_uuid(). FF-A v1.1 and above
* provides UUID here for each partition as part of the * provides UUID here for each partition as part of the
* discovery API and the same is passed. * discovery API and the same is passed.
*/ */
ffa_dev = ffa_device_register(&uuid, tpbuf->id, &ffa_drv_ops); ffa_dev = ffa_device_register(tpbuf, &ffa_drv_ops);
if (!ffa_dev) { if (!ffa_dev) {
pr_err("%s: failed to register partition ID 0x%x\n", pr_err("%s: failed to register partition ID 0x%x\n",
__func__, tpbuf->id); __func__, tpbuf->id);
continue; continue;
} }
ffa_dev->properties = tpbuf->properties;
if (drv_info->version > FFA_VERSION_1_0 && if (drv_info->version > FFA_VERSION_1_0 &&
!(tpbuf->properties & FFA_PARTITION_AARCH64_EXEC)) !(tpbuf->properties & FFA_PARTITION_AARCH64_EXEC))
ffa_mode_32bit_set(ffa_dev); ffa_mode_32bit_set(ffa_dev);

9
include/linux/arm_ffa.h
View File

@ -166,8 +166,11 @@ static inline void *ffa_dev_get_drvdata(struct ffa_device *fdev)
return dev_get_drvdata(&fdev->dev); return dev_get_drvdata(&fdev->dev);
} }
struct ffa_partition_info;
#if IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT) #if IS_REACHABLE(CONFIG_ARM_FFA_TRANSPORT)
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id, struct ffa_device *
ffa_device_register(const struct ffa_partition_info *part_info,
const struct ffa_ops *ops); const struct ffa_ops *ops);
void ffa_device_unregister(struct ffa_device *ffa_dev); void ffa_device_unregister(struct ffa_device *ffa_dev);
int ffa_driver_register(struct ffa_driver *driver, struct module *owner, int ffa_driver_register(struct ffa_driver *driver, struct module *owner,
@ -176,8 +179,8 @@ void ffa_driver_unregister(struct ffa_driver *driver);
bool ffa_device_is_valid(struct ffa_device *ffa_dev); bool ffa_device_is_valid(struct ffa_device *ffa_dev);
#else #else
static inline static inline struct ffa_device *
struct ffa_device *ffa_device_register(const uuid_t *uuid, int vm_id, ffa_device_register(const struct ffa_partition_info *part_info,
const struct ffa_ops *ops) const struct ffa_ops *ops)
{ {
return NULL; return NULL;