aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2013-01-04 11:33:21 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-17 08:44:08 -0800
commit2d8a66efb832e17e906415a4e563182258cc0ab2 (patch)
tree042f882c7a40770337e295cc1d8c51dbc020d777 /drivers/media
parentbf302ba15f9fc5fa2d84c6eaa2e740a0e0bb596b (diff)
staging: comedi: comedi_test: fix race when cancelling command
commit c0729eeefdcd76db338f635162bf0739fd2c5f6f upstream. Éric Piel reported a kernel oops in the "comedi_test" module. It was a NULL pointer dereference within `waveform_ai_interrupt()` (actually a timer function) that sometimes occurred when a running asynchronous command is cancelled (either by the `COMEDI_CANCEL` ioctl or by closing the device file). This seems to be a race between the caller of `waveform_ai_cancel()` which on return from that function goes and tears down the running command, and the timer function which uses the command. In particular, `async->cmd.chanlist` gets freed (and the pointer set to NULL) by `do_become_nonbusy()` in "comedi_fops.c" but a previously scheduled `waveform_ai_interrupt()` timer function will dereference that pointer regardless, leading to the oops. Fix it by replacing the `del_timer()` call in `waveform_ai_cancel()` with `del_timer_sync()`. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reported-by: Éric Piel <piel@delmic.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions