diff options
| author | Jon Mason <jon.mason@intel.com> | 2012-11-11 23:03:20 +0000 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-01-07 22:05:05 -0800 |
| commit | 944ea4dd38b8575e30a5699633c81945bff1864d (patch) | |
| tree | 7883205efd57c7c1e95ad2cb2bed59bde165ecc8 /drivers/dma/dmatest.c | |
| parent | e4d43c1764bc3ee1150f24e530db2b5b23e91425 (diff) | |
| download | linux-944ea4dd38b8575e30a5699633c81945bff1864d.tar.gz linux-944ea4dd38b8575e30a5699633c81945bff1864d.tar.bz2 linux-944ea4dd38b8575e30a5699633c81945bff1864d.zip | |
dmatest: Fix NULL pointer dereference on ioat
device_control is an optional and not implemented in all DMA drivers.
Any calls to these will result in a NULL pointer dereference. dmatest
makes two of these calls when completing the kernel thread and removing
the module. These are corrected by calling the dmaengine_device_control
wrapper and checking for a non-existant device_control function pointer
there.
Signed-off-by: Jon Mason <jon.mason@intel.com>
CC: Vinod Koul <vinod.koul@intel.com>
CC: Dan Williams <djbw@fb.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma/dmatest.c')
| -rw-r--r-- | drivers/dma/dmatest.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index 3a8047b1f108..99a75e5d66be 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c @@ -536,7 +536,7 @@ err_srcs: thread_name, total_tests, failed_tests, ret); /* terminate all transfers on specified channels */ - chan->device->device_control(chan, DMA_TERMINATE_ALL, 0); + dmaengine_terminate_all(chan); if (iterations > 0) while (!kthread_should_stop()) { DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait_dmatest_exit); @@ -561,7 +561,7 @@ static void dmatest_cleanup_channel(struct dmatest_chan *dtc) } /* terminate all transfers on specified channels */ - dtc->chan->device->device_control(dtc->chan, DMA_TERMINATE_ALL, 0); + dmaengine_terminate_all(dtc->chan); kfree(dtc); } |