From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pb0-x22b.google.com (mail-pb0-x22b.google.com [IPv6:2607:f8b0:400e:c01::22b]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 5AA0F1A00D3 for ; Tue, 10 Jun 2014 17:32:47 +1000 (EST) Received: by mail-pb0-f43.google.com with SMTP id up15so5934681pbc.2 for ; Tue, 10 Jun 2014 00:32:44 -0700 (PDT) From: Zhouyi Zhou To: , , , , , , , , Subject: [PATCH 1/1] powerpc/iommu: Handling null return of kzalloc_node Date: Tue, 10 Jun 2014 15:32:10 +0800 Message-Id: <1402385530-23091-1-git-send-email-zhouzhouyi@gmail.com> Cc: Zhouyi Zhou , Zhouyi Zhou List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , NULL return of kzalloc_node should be handled Signed-off-by: Zhouyi Zhou --- arch/powerpc/platforms/pseries/iommu.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 33b552f..593cd3d 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c @@ -613,7 +613,11 @@ static void pci_dma_bus_setup_pSeries(struct pci_bus *bus) tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL, pci->phb->node); - + if (!tbl) { + pr_debug(" out of memory, can't create iommu_table !\n"); + return; + } + iommu_table_setparms(pci->phb, dn, tbl); pci->iommu_table = iommu_init_table(tbl, pci->phb->node); iommu_register_group(tbl, pci_domain_nr(bus), 0); @@ -659,6 +663,10 @@ static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus) if (!ppci->iommu_table) { tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL, ppci->phb->node); + if (!tbl) { + pr_debug(" out of memory, can't create iommu_table !\n"); + return; + } iommu_table_setparms_lpar(ppci->phb, pdn, tbl, dma_window); ppci->iommu_table = iommu_init_table(tbl, ppci->phb->node); iommu_register_group(tbl, pci_domain_nr(bus), 0); @@ -686,6 +694,11 @@ static void pci_dma_dev_setup_pSeries(struct pci_dev *dev) pr_debug(" --> first child, no bridge. Allocating iommu table.\n"); tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL, phb->node); + if (!tbl) { + pr_debug(" out of memory, can't create iommu_table !\n"); + return; + } + iommu_table_setparms(phb, dn, tbl); PCI_DN(dn)->iommu_table = iommu_init_table(tbl, phb->node); iommu_register_group(tbl, pci_domain_nr(phb->bus), 0); @@ -1102,6 +1116,10 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev) if (!pci->iommu_table) { tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL, pci->phb->node); + if (!tbl) { + pr_debug(" out of memory, can't create iommu_table !\n"); + return; + } iommu_table_setparms_lpar(pci->phb, pdn, tbl, dma_window); pci->iommu_table = iommu_init_table(tbl, pci->phb->node); iommu_register_group(tbl, pci_domain_nr(pci->phb->bus), 0); -- 1.7.10.4