summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSven Van Asbroeck <thesven73@gmail.com>2019-03-10 21:58:25 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-16 20:40:12 +0300
commit1fc0aeddc0b7490e2fbfb688f66e3c8dc6b5c2d1 (patch)
tree4a1f45b8dff3b272822bb854261ade868ee5bb91 /drivers
parentfc92e97e24dfca591e53de7f2649005a7aaedc61 (diff)
downloadlinux-1fc0aeddc0b7490e2fbfb688f66e3c8dc6b5c2d1.tar.xz
iio: adc: xilinx: fix potential use-after-free on probe
[ Upstream commit 862e4644fd2d7df8998edc65e0963ea2f567bde9 ] If probe errors out after request_irq(), its error path does not explicitly cancel the delayed work, which may have been scheduled by the interrupt handler. This means the delayed work may still be running when the core frees the private structure (struct xadc). This is a potential use-after-free. Fix by inserting cancel_delayed_work_sync() in the probe error path. Signed-off-by: Sven Van Asbroeck <TheSven73@gmail.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iio/adc/xilinx-xadc-core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c
index 1960694e8007..15e1a103f37d 100644
--- a/drivers/iio/adc/xilinx-xadc-core.c
+++ b/drivers/iio/adc/xilinx-xadc-core.c
@@ -1290,6 +1290,7 @@ static int xadc_probe(struct platform_device *pdev)
err_free_irq:
free_irq(xadc->irq, indio_dev);
+ cancel_delayed_work_sync(&xadc->zynq_unmask_work);
err_clk_disable_unprepare:
clk_disable_unprepare(xadc->clk);
err_free_samplerate_trigger: