aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorWen Yang <wenyang@linux.alibaba.com>2019-11-30 21:08:42 +0800
committerEnric Balletbo i Serra <enric.balletbo@collabora.com>2019-12-02 12:14:42 +0100
commit856a0a6e2d09d31fd8f00cc1fc6645196a509d56 (patch)
tree575abfd3e15af1a79f88cdb4f73b4ca9c4e5cc01 /drivers
parentplatform/chrome: cros_ec: Add Kconfig default for cros-ec-sensorhub (diff)
downloadlinux-dev-856a0a6e2d09d31fd8f00cc1fc6645196a509d56.tar.xz
linux-dev-856a0a6e2d09d31fd8f00cc1fc6645196a509d56.zip
platform/chrome: wilco_ec: fix use after free issue
This is caused by dereferencing 'dev_data' after put_device() in the telem_device_remove() function. This patch just moves the put_device() down a bit to avoid this issue. Fixes: 1210d1e6bad1 ("platform/chrome: wilco_ec: Add telemetry char device interface") Signed-off-by: Wen Yang <wenyang@linux.alibaba.com> Cc: Benson Leung <bleung@chromium.org> Cc: Enric Balletbo i Serra <enric.balletbo@collabora.com> Cc: Nick Crews <ncrews@chromium.org> Cc: linux-kernel@vger.kernel.org Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/platform/chrome/wilco_ec/telemetry.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/chrome/wilco_ec/telemetry.c b/drivers/platform/chrome/wilco_ec/telemetry.c
index b9d03c33d8dc..1176d543191a 100644
--- a/drivers/platform/chrome/wilco_ec/telemetry.c
+++ b/drivers/platform/chrome/wilco_ec/telemetry.c
@@ -406,8 +406,8 @@ static int telem_device_remove(struct platform_device *pdev)
struct telem_device_data *dev_data = platform_get_drvdata(pdev);
cdev_device_del(&dev_data->cdev, &dev_data->dev);
- put_device(&dev_data->dev);
ida_simple_remove(&telem_ida, MINOR(dev_data->dev.devt));
+ put_device(&dev_data->dev);
return 0;
}