diff options
| author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2011-08-31 09:34:35 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-09-05 18:57:38 +0530 |
| commit | 7703eac96abd119dcfbb04f287a5127462d18269 (patch) | |
| tree | 75de31e4ddfe8f1899b7547d40e84be6d5b4face /drivers/dma | |
| parent | 503473ac2a3952e6af254b0769fe788a67d797e5 (diff) | |
| download | op-kernel-dev-7703eac96abd119dcfbb04f287a5127462d18269.zip op-kernel-dev-7703eac96abd119dcfbb04f287a5127462d18269.tar.gz | |
dmaengine: amba-pl08x: make filter check that the channel is owned by pl08x
Before converting the dma channel to our private data structure, first
check that the channel is indeed one which our driver registered. We
do this by ensuring that the underlying device is bound to our driver.
This avoids potential oopses if we try to reference 'plchan->name'
against a foreign drivers dma channel.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/amba-pl08x.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 3c2cad5..cd8df7f 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -87,6 +87,8 @@ #define DRIVER_NAME "pl08xdmac" +static struct amba_driver pl08x_amba_driver; + /** * struct vendor_data - vendor-specific config parameters for PL08x derivatives * @channels: the number of channels available in this variant @@ -1420,9 +1422,15 @@ static int pl08x_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, bool pl08x_filter_id(struct dma_chan *chan, void *chan_id) { - struct pl08x_dma_chan *plchan = to_pl08x_chan(chan); + struct pl08x_dma_chan *plchan; char *name = chan_id; + /* Reject channels for devices not bound to this driver */ + if (chan->device->dev->driver != &pl08x_amba_driver.drv) + return false; + + plchan = to_pl08x_chan(chan); + /* Check that the channel is not taken! */ if (!strcmp(plchan->name, name)) return true; |
