From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8027ECAAA1 for ; Tue, 30 Aug 2022 17:33:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231643AbiH3RdD (ORCPT ); Tue, 30 Aug 2022 13:33:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231877AbiH3RcB (ORCPT ); Tue, 30 Aug 2022 13:32:01 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBB7512EC47; Tue, 30 Aug 2022 10:28:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E6CBC61782; Tue, 30 Aug 2022 17:27:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 703E5C433D6; Tue, 30 Aug 2022 17:27:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1661880432; bh=Y5wq0g3mZu2wF+NTvQYKTtZ113Sd6gEawyb/vEOcDYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PQZQU5NQWvP3k4bAJsBOWf2h09NjDhJKMZ453tj9hgAi0FT6NeTjrK0vkQ8aYUIVJ 2dFy5nRyfXsCSxmFLaP+OaIVkPfX0wuYfQp7IlJVGjCT0W2pGrz4r5C/+fbVK5nmfJ JNRwXjXL2wf+JwUyugk9fP+wGK934DNl0JtjInxO8IzAiUHVvCY9LFWTzGijryncPb dHcxcvu3hCnXHzTfzMDsW18wISaIRzAZdRoyy9mz+H2vX63xj4b0rCfLVj3zCpW51e tne09NLC/vDRN8yjIBGW2JMpx90Q0dfRbx+KHlO5FX0ms7gWaDDdtuIex7hEbZ4x55 +K4MLyGzj57gw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Li Qiong , Helge Deller , Sasha Levin , James.Bottomley@HansenPartnership.com, linux-parisc@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 3/6] parisc: ccio-dma: Handle kmalloc failure in ccio_init_resources() Date: Tue, 30 Aug 2022 13:27:03 -0400 Message-Id: <20220830172706.582088-3-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220830172706.582088-1-sashal@kernel.org> References: <20220830172706.582088-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Li Qiong [ Upstream commit d46c742f827fa2326ab1f4faa1cccadb56912341 ] As the possible failure of the kmalloc(), it should be better to fix this error path, check and return '-ENOMEM' error code. Signed-off-by: Li Qiong Signed-off-by: Helge Deller Signed-off-by: Sasha Levin --- drivers/parisc/ccio-dma.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index f6ef5952e94b3..633762f8d7755 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c @@ -1408,15 +1408,17 @@ ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr) } } -static void __init ccio_init_resources(struct ioc *ioc) +static int __init ccio_init_resources(struct ioc *ioc) { struct resource *res = ioc->mmio_region; char *name = kmalloc(14, GFP_KERNEL); - + if (unlikely(!name)) + return -ENOMEM; snprintf(name, 14, "GSC Bus [%d/]", ioc->hw_path); ccio_init_resource(res, name, &ioc->ioc_regs->io_io_low); ccio_init_resource(res + 1, name, &ioc->ioc_regs->io_io_low_hv); + return 0; } static int new_ioc_area(struct resource *res, unsigned long size, @@ -1566,7 +1568,10 @@ static int __init ccio_probe(struct parisc_device *dev) ioc->hw_path = dev->hw_path; ioc->ioc_regs = ioremap_nocache(dev->hpa.start, 4096); ccio_ioc_init(ioc); - ccio_init_resources(ioc); + if (ccio_init_resources(ioc)) { + kfree(ioc); + return -ENOMEM; + } hppa_dma_ops = &ccio_ops; dev->dev.platform_data = kzalloc(sizeof(struct pci_hba_data), GFP_KERNEL); -- 2.35.1