Skip to content

Commit 6265539

Browse files
adriansmgregkh
authored andcommitted
driver core: platform: fix race condition with driver_override
The driver_override implementation is susceptible to race condition when different threads are reading vs storing a different driver override. Add locking to avoid race condition. Fixes: 3d713e0 ("driver core: platform: add device binding path 'driver_override'") Cc: [email protected] Signed-off-by: Adrian Salido <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0833289 commit 6265539

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

drivers/base/platform.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ static ssize_t driver_override_store(struct device *dev,
866866
const char *buf, size_t count)
867867
{
868868
struct platform_device *pdev = to_platform_device(dev);
869-
char *driver_override, *old = pdev->driver_override, *cp;
869+
char *driver_override, *old, *cp;
870870

871871
if (count > PATH_MAX)
872872
return -EINVAL;
@@ -879,12 +879,15 @@ static ssize_t driver_override_store(struct device *dev,
879879
if (cp)
880880
*cp = '\0';
881881

882+
device_lock(dev);
883+
old = pdev->driver_override;
882884
if (strlen(driver_override)) {
883885
pdev->driver_override = driver_override;
884886
} else {
885887
kfree(driver_override);
886888
pdev->driver_override = NULL;
887889
}
890+
device_unlock(dev);
888891

889892
kfree(old);
890893

@@ -895,8 +898,12 @@ static ssize_t driver_override_show(struct device *dev,
895898
struct device_attribute *attr, char *buf)
896899
{
897900
struct platform_device *pdev = to_platform_device(dev);
901+
ssize_t len;
898902

899-
return sprintf(buf, "%s\n", pdev->driver_override);
903+
device_lock(dev);
904+
len = sprintf(buf, "%s\n", pdev->driver_override);
905+
device_unlock(dev);
906+
return len;
900907
}
901908
static DEVICE_ATTR_RW(driver_override);
902909

0 commit comments

Comments
 (0)