shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

nvmem: core: fix registration vs use race

Browse Source 
The i.MX6 CPU frequency driver sometimes fails to register at boot time
due to nvmem_cell_read_u32() sporadically returning -ENOENT.

This happens because there is a window where __nvmem_device_get() in
of_nvmem_cell_get() is able to return the nvmem device, but as cells
have been setup, nvmem_find_cell_entry_by_node() returns NULL.

The occurs because the nvmem core registration code violates one of the
fundamental principles of kernel programming: do not publish data
structures before their setup is complete.

Fix this by making nvmem core code conform with this principle.

Fixes: eace75cfdc ("nvmem: Add a simple NVMEM framework for nvmem providers")
Cc: stable@vger.kernel.org
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230127104015.23839-7-srinivas.kandagatla@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Russell King (Oracle)
2023-01-27 10:40:11 +00:00
committed by Greg Kroah-Hartman
parent 560181d3ac
commit ab3428cfd9
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/nvmem/core.c
View File

@@ -832,22 +832,16 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
nvmem->dev.groups = nvmem_dev_groups; nvmem->dev.groups = nvmem_dev_groups;
#endif #endif
dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);
rval = device_add(&nvmem->dev);
if (rval)
goto err_put_device;
if (nvmem->nkeepout) { if (nvmem->nkeepout) {
rval = nvmem_validate_keepouts(nvmem); rval = nvmem_validate_keepouts(nvmem);
if (rval) if (rval)
goto err_device_del; goto err_put_device;
} }
if (config->compat) { if (config->compat) {
rval = nvmem_sysfs_setup_compat(nvmem, config); rval = nvmem_sysfs_setup_compat(nvmem, config);
if (rval) if (rval)
goto err_device_del; goto err_put_device;
} }
if (config->cells) { if (config->cells) {
@@ -864,6 +858,12 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config)
if (rval) if (rval)
goto err_remove_cells; goto err_remove_cells;
dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name);
rval = device_add(&nvmem->dev);
if (rval)
goto err_remove_cells;
blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem);
return nvmem; return nvmem;
@@ -873,8 +873,6 @@ err_remove_cells:
err_teardown_compat: err_teardown_compat:
if (config->compat) if (config->compat)
nvmem_sysfs_remove_compat(nvmem, config); nvmem_sysfs_remove_compat(nvmem, config);
err_device_del:
device_del(&nvmem->dev);
err_put_device: err_put_device:
put_device(&nvmem->dev); put_device(&nvmem->dev);