Commit f797d988 authored by Shaun Ruffell's avatar Shaun Ruffell Committed by Joerg Roedel

dma-debug: Do not add notifier when dma debugging is disabled.

If CONFIG_HAVE_DMA_API_DEBUG is defined and "dma_debug=off" is
specified on the kernel command line, when you detach a driver from a
device you can cause the following NULL pointer dereference:

BUG: unable to handle kernel NULL pointer dereference at (null)
IP: [<c0580d35>] dma_debug_device_change+0x5d/0x117

The problem is that the dma_debug_device_change notifier function is
added to the bus notifier chain even though the dma_entry_hash array
was never initialized.  If dma debugging is disabled, this patch both
prevents dma_debug_device_change notifiers from being added to the
chain, and additionally ensures that the dma_debug_device_change
notifier function is a no-op.

Cc: stable@kernel.org
Signed-off-by: default avatarShaun Ruffell <sruffell@digium.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 55639353
...@@ -676,6 +676,8 @@ static int dma_debug_device_change(struct notifier_block *nb, ...@@ -676,6 +676,8 @@ static int dma_debug_device_change(struct notifier_block *nb,
struct device *dev = data; struct device *dev = data;
int count; int count;
if (global_disable)
return;
switch (action) { switch (action) {
case BUS_NOTIFY_UNBOUND_DRIVER: case BUS_NOTIFY_UNBOUND_DRIVER:
...@@ -697,6 +699,9 @@ void dma_debug_add_bus(struct bus_type *bus) ...@@ -697,6 +699,9 @@ void dma_debug_add_bus(struct bus_type *bus)
{ {
struct notifier_block *nb; struct notifier_block *nb;
if (global_disable)
return;
nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL); nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL);
if (nb == NULL) { if (nb == NULL) {
pr_err("dma_debug_add_bus: out of memory\n"); pr_err("dma_debug_add_bus: out of memory\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment