Skip to contentSkip to conversation

x86, pci-nommu: fix potential NULL-ptr dereference in check_addr()

PATCH New Arne Redlich 1 participant 1 message Aug 29, 2011 x86

lore
Share & tools
lore

Arne Redlich

author
#0 lore raw

PATCH 1/1 x86, pci-nommu: fix potential NULL-ptr dereference in check_addr()

check_addr() dereferences hwdev->dma_mask without first checking that it's actually non-NULL.

Signed-off-by Arne Redlich <[email protected]>
---
 arch/x86/kernel/pci-nommu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/kernel/pci-nommu.c +1 -1
index 3af4af8..55b49c7 100644
@@ -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,
Signature · 1 line
1.7.4.1