From: roel kluin <roel.kluin@gmail.com>
Date: Wed, 9 Sep 2009 05:02:24 +0000 (+0000)
Subject: powerpc: kmalloc failure ignored in vio_build_iommu_table()
X-Git-Tag: v2.6.32-rc1~29^2~15
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0f3372741f2de8dc85a60be737b519a47b395b85;p=linux-block.git

powerpc: kmalloc failure ignored in vio_build_iommu_table()

Prevent NULL dereference if kmalloc() fails.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---

diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index bc7b41edbdfc..1b4f674ad7c4 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1054,6 +1054,8 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
 		return NULL;
 
 	tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
+	if (tbl == NULL)
+		return NULL;
 
 	of_parse_dma_window(dev->dev.archdata.of_node, dma_window,
 			    &tbl->it_index, &offset, &size);