| Message ID | 1460036983-24326-1-git-send-email-jarkko.nikula@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Apr 07, 2016 at 04:49:43PM +0300, Jarkko Nikula wrote: > Commit ef859312c3a1 ("dmaengine: core: Use dev_ functions for debug and > error prints") wasn't quite right in __dma_request_channel() by claiming > that all pr_ prints have valid DMA channel pointer. Obviously it is not > true as __dma_request_channel() is looking for a channel and returns NULL > if it does not find it. > > Prevent this potential NULL pointer dereference by reverting back to > pr_debug(). Applied, thanks
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index a7131d4141d8..ca1400d66957 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c @@ -664,7 +664,7 @@ struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, } mutex_unlock(&dma_list_mutex); - dev_dbg(chan->device->dev, "%s: %s (%s)\n", + pr_debug("%s: %s (%s)\n", __func__, chan ? "success" : "fail", chan ? dma_chan_name(chan) : NULL);
Commit ef859312c3a1 ("dmaengine: core: Use dev_ functions for debug and error prints") wasn't quite right in __dma_request_channel() by claiming that all pr_ prints have valid DMA channel pointer. Obviously it is not true as __dma_request_channel() is looking for a channel and returns NULL if it does not find it. Prevent this potential NULL pointer dereference by reverting back to pr_debug(). Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/dma/dmaengine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)