diff options
| author | Sven Van Asbroeck <thesven73@gmail.com> | 2019-03-10 14:58:24 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-16 09:17:22 +0200 |
| commit | b8f6da2fcb2e555c4d8a2572e18d44b631d3eaad (patch) | |
| tree | 68bb6a496f06ac7e2551b4cbba445c9fad15c177 | |
| parent | 23a030f79c350f2f9a11a940644d9944b04fab9e (diff) | |
| download | linux-stable-b8f6da2fcb2e555c4d8a2572e18d44b631d3eaad.tar.gz linux-stable-b8f6da2fcb2e555c4d8a2572e18d44b631d3eaad.tar.bz2 linux-stable-b8f6da2fcb2e555c4d8a2572e18d44b631d3eaad.zip | |
iio: adc: xilinx: fix potential use-after-free on remove
[ Upstream commit 62039b6aef63380ba7a37c113bbaeee8a55c5342 ]
When cancel_delayed_work() returns, the delayed work may still
be running. This means that the core could potentially free
the private structure (struct xadc) while the delayed work
is still using it. This is a potential use-after-free.
Fix by calling cancel_delayed_work_sync(), which waits for
any residual work to finish before returning.
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>
| -rw-r--r-- | drivers/iio/adc/xilinx-xadc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/adc/xilinx-xadc-core.c b/drivers/iio/adc/xilinx-xadc-core.c index a483747cdc9b..b520de11fc17 100644 --- a/drivers/iio/adc/xilinx-xadc-core.c +++ b/drivers/iio/adc/xilinx-xadc-core.c @@ -1315,7 +1315,7 @@ static int xadc_remove(struct platform_device *pdev) } free_irq(irq, indio_dev); clk_disable_unprepare(xadc->clk); - cancel_delayed_work(&xadc->zynq_unmask_work); + cancel_delayed_work_sync(&xadc->zynq_unmask_work); kfree(xadc->data); kfree(indio_dev->channels); |