* [PATCH] x86, pci-nommu: fix potential NULL-ptr dereference in check_addr()
@ 2011-08-29 19:01 Arne Redlich
0 siblings, 0 replies; only message in thread
From: Arne Redlich @ 2011-08-29 19:01 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, x86, linux-kernel
check_addr() dereferences hwdev->dma_mask without first checking
that it's actually non-NULL.
Signed-off-by: Arne Redlich <arne.redlich@googlemail.com>
---
arch/x86/kernel/pci-nommu.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/pci-nommu.c b/arch/x86/kernel/pci-nommu.c
index 3af4af8..55b49c7 100644
--- a/arch/x86/kernel/pci-nommu.c
+++ b/arch/x86/kernel/pci-nommu.c
@@ -16,7 +16,7 @@ static int
check_addr(char *name, struct device *hwdev, dma_addr_t bus, size_t size)
{
if (hwdev && !dma_capable(hwdev, bus, size)) {
- if (*hwdev->dma_mask >= DMA_BIT_MASK(32))
+ if (hwdev->dma_mask && *hwdev->dma_mask >= DMA_BIT_MASK(32))
printk(KERN_ERR
"nommu_%s: overflow %Lx+%zu of device mask %Lx\n",
name, (long long)bus, size,
--
1.7.4.1
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-29 19:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-29 19:01 [PATCH] x86, pci-nommu: fix potential NULL-ptr dereference in check_addr() Arne Redlich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox