From mboxrd@z Thu Jan 1 00:00:00 1970 From: Amit Kumar Salecha Subject: [PATCH 7/8] netxen: added sanity check for pci map Date: Wed, 24 Mar 2010 06:29:22 -0700 Message-ID: <1269437363-2606-8-git-send-email-amit.salecha@qlogic.com> References: <1269437363-2606-1-git-send-email-amit.salecha@qlogic.com> Cc: netdev@vger.kernel.org, ameen.rahman@qlogic.com To: davem@davemloft.net Return-path: Received: from mvnat01.qlogic.com ([198.186.3.73]:45845 "HELO unm84.unmin.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1756224Ab0CXN3Z (ORCPT ); Wed, 24 Mar 2010 09:29:25 -0400 In-Reply-To: <1269437363-2606-1-git-send-email-amit.salecha@qlogic.com> Sender: netdev-owner@vger.kernel.org List-ID: Signed-off-by: Amit Kumar Salecha Return value of ioremap is not checked, NULL check added. --- drivers/net/netxen/netxen_nic_main.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 4c9caea..ee16aa2 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -636,10 +636,22 @@ netxen_setup_pci_map(struct netxen_adapter *adapter) mem_ptr2 = ioremap(mem_base + THIRD_PAGE_GROUP_START, THIRD_PAGE_GROUP_SIZE); pci_len0 = FIRST_PAGE_GROUP_SIZE; + + if (mem_ptr0 == NULL || mem_ptr1 == NULL || mem_ptr2 == NULL) { + dev_err(&pdev->dev, "failed to map PCI bar 0\n"); + return -EIO; + } + } else if (mem_len == NETXEN_PCI_32MB_SIZE) { mem_ptr1 = ioremap(mem_base, SECOND_PAGE_GROUP_SIZE); mem_ptr2 = ioremap(mem_base + THIRD_PAGE_GROUP_START - SECOND_PAGE_GROUP_START, THIRD_PAGE_GROUP_SIZE); + + if (mem_ptr1 == NULL || mem_ptr2 == NULL) { + dev_err(&pdev->dev, "failed to map PCI bar 0\n"); + return -EIO; + } + } else if (mem_len == NETXEN_PCI_2MB_SIZE) { mem_ptr0 = pci_ioremap_bar(pdev, 0); -- 1.6.0.2