diff options
| author | Adrian Salido <salidoa@google.com> | 2017-04-25 16:55:26 -0700 |
|---|---|---|
| committer | Adrian Salido <salidoa@google.com> | 2017-07-17 19:37:45 -0700 |
| commit | ba27b43e53dc8d151bd659877421bd11252e45cd (patch) | |
| tree | 72e48f153a3d9faa0019681add29851c344266a0 | |
| parent | 20ab4a2af7e24af2b3fdd02935b5e8aafbe43fdc (diff) | |
| download | tegra-ba27b43e53dc8d151bd659877421bd11252e45cd.tar.gz | |
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: 3d713e0e382e ("driver core: platform: add device binding path 'driver_override'")
Cc: stable@vger.kernel.org
Bug: 35676417
Signed-off-by: Adrian Salido <salidoa@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Change-Id: I378bddb94afa3c21f1200f80ceacbbaca625cb75
| -rw-r--r-- | drivers/base/platform.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index cdb6c076c3f7..d92e0956c566 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -724,7 +724,7 @@ static ssize_t driver_override_store(struct device *dev, const char *buf, size_t count) { struct platform_device *pdev = to_platform_device(dev); - char *driver_override, *old = pdev->driver_override, *cp; + char *driver_override, *old, *cp; if (count > PATH_MAX) return -EINVAL; @@ -737,12 +737,15 @@ static ssize_t driver_override_store(struct device *dev, if (cp) *cp = '\0'; + device_lock(dev); + old = pdev->driver_override; if (strlen(driver_override)) { pdev->driver_override = driver_override; } else { kfree(driver_override); pdev->driver_override = NULL; } + device_unlock(dev); kfree(old); @@ -753,8 +756,12 @@ static ssize_t driver_override_show(struct device *dev, struct device_attribute *attr, char *buf) { struct platform_device *pdev = to_platform_device(dev); + ssize_t len; - return sprintf(buf, "%s\n", pdev->driver_override); + device_lock(dev); + len = sprintf(buf, "%s\n", pdev->driver_override); + device_unlock(dev); + return len; } static DEVICE_ATTR_RW(driver_override); |