diff options
| author | Julia Lawall | 2010-08-23 15:31:34 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-08-23 20:41:24 +0200 |
| commit | 6e0c64f4ddf4a76a04108c1e24132d5d7dea8872 (patch) | |
| tree | 581e5a5bf54f854be60ba1c69fd400589c307bcb | |
| parent | Merge branch 'misc' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | kernel-qcow2-linux-6e0c64f4ddf4a76a04108c1e24132d5d7dea8872.tar.gz kernel-qcow2-linux-6e0c64f4ddf4a76a04108c1e24132d5d7dea8872.tar.xz kernel-qcow2-linux-6e0c64f4ddf4a76a04108c1e24132d5d7dea8872.zip | |
arch/mn10300/mm: eliminate NULL dereference
dev_name always dereferences its argument, so it should not be called if
the argument is NULL. The function indeed later tests the argument for
being NULL.
The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
expression dev,E;
@@
*dev_name(dev)
... when != dev = E
(
*dev == NULL
|
*dev != NULL
)
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/mn10300/mm/dma-alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/mm/dma-alloc.c b/arch/mn10300/mm/dma-alloc.c index 4e34880bea03..159acb02cfd4 100644 --- a/arch/mn10300/mm/dma-alloc.c +++ b/arch/mn10300/mm/dma-alloc.c @@ -25,7 +25,8 @@ void *dma_alloc_coherent(struct device *dev, size_t size, unsigned long addr; void *ret; - printk("dma_alloc_coherent(%s,%zu,,%x)\n", dev_name(dev), size, gfp); + pr_debug("dma_alloc_coherent(%s,%zu,%x)\n", + dev ? dev_name(dev) : "?", size, gfp); if (0xbe000000 - pci_sram_allocated >= size) { size = (size + 255) & ~255; |