diff options
author | Shaun Ruffell <sruffell@digium.com> | 2009-12-17 19:00:36 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-12-21 09:10:12 -0500 |
commit | f797d9881b62c2ddb1d2e7bd80d87141949c84aa (patch) | |
tree | e52785a6c036130cfbe82b0ad9e5cc364acc7be4 | |
parent | 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f (diff) |
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: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
-rw-r--r-- | lib/dma-debug.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index d9b08e0f7f55..739974460c32 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
@@ -676,6 +676,8 @@ static int dma_debug_device_change(struct notifier_block *nb, | |||
676 | struct device *dev = data; | 676 | struct device *dev = data; |
677 | int count; | 677 | int count; |
678 | 678 | ||
679 | if (global_disable) | ||
680 | return; | ||
679 | 681 | ||
680 | switch (action) { | 682 | switch (action) { |
681 | case BUS_NOTIFY_UNBOUND_DRIVER: | 683 | case BUS_NOTIFY_UNBOUND_DRIVER: |
@@ -697,6 +699,9 @@ void dma_debug_add_bus(struct bus_type *bus) | |||
697 | { | 699 | { |
698 | struct notifier_block *nb; | 700 | struct notifier_block *nb; |
699 | 701 | ||
702 | if (global_disable) | ||
703 | return; | ||
704 | |||
700 | nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL); | 705 | nb = kzalloc(sizeof(struct notifier_block), GFP_KERNEL); |
701 | if (nb == NULL) { | 706 | if (nb == NULL) { |
702 | pr_err("dma_debug_add_bus: out of memory\n"); | 707 | pr_err("dma_debug_add_bus: out of memory\n"); |