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 32840C433FE for ; Wed, 24 Nov 2021 22:49:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352135AbhKXWxB (ORCPT ); Wed, 24 Nov 2021 17:53:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:46946 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244982AbhKXWw7 (ORCPT ); Wed, 24 Nov 2021 17:52:59 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1A48661074; Wed, 24 Nov 2021 22:49:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637794189; bh=lkmT5oUlkagVlqjx9WivqLmmqv3j4oR0Fkd27SiI9C8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jb4E+Qe5UZqAUcdCXVzrgNg6QELBAq/wZCszFsb7f7PD5iPp4idomPWsS0TK5HXzI xjt5FrWxfRGhd80jw2nAH90/s6GRBebFKW3XbS7DxZkjhSNPn3WX8OnEb1IeteanOW x8F9njdXS+z1vjYD0jvWqxVHk1TebD2ojpZb1jA8m0eMPz4sJ6CFaOGJXo6adqnf2e nYeD2PigtsY/eprAhUrsqaE7MBusY1UlTTUiJfYJc0W0sJeErTTmOduCX7blzWoeRV 8aIb3oNxgZ0nsemC+D0BY8DDoAE02ZNfxOo516EOI92n0Hd8nsH9MUeQKCc/SyN7mo EfEvIxkP9smkA== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Greg Kroah-Hartman , Sasha Levin Cc: pali@kernel.org, stable@vger.kernel.org, Wen Yang , Lorenzo Pieralisi , Thomas Petazzoni , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 4.14 02/24] PCI: aardvark: Fix a leaked reference by adding missing of_node_put() Date: Wed, 24 Nov 2021 23:49:11 +0100 Message-Id: <20211124224933.24275-3-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211124224933.24275-1-kabel@kernel.org> References: <20211124224933.24275-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Wen Yang commit 3842f5166bf1ef286fe7a39f262b5c9581308366 upstream. The call to of_get_next_child() returns a node pointer with refcount incremented thus it must be explicitly decremented after the last usage. irq_domain_add_linear() also calls of_node_get() to increase refcount, so irq_domain will not be affected when it is released. Detected by coccinelle with the following warnings: ./drivers/pci/controller/pci-aardvark.c:826:1-7: ERROR: missing of_node_put; acquired a node pointer with refcount incremented on line 798, but without a corresponding object release within this function. Signed-off-by: Wen Yang Signed-off-by: Lorenzo Pieralisi Cc: Thomas Petazzoni Cc: Lorenzo Pieralisi Cc: Bjorn Helgaas Cc: linux-pci@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Marek Behún --- drivers/pci/host/pci-aardvark.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c index fd605796b011..79cd11b1c89a 100644 --- a/drivers/pci/host/pci-aardvark.c +++ b/drivers/pci/host/pci-aardvark.c @@ -789,6 +789,7 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie) struct device_node *node = dev->of_node; struct device_node *pcie_intc_node; struct irq_chip *irq_chip; + int ret = 0; raw_spin_lock_init(&pcie->irq_lock); @@ -803,8 +804,8 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie) irq_chip->name = devm_kasprintf(dev, GFP_KERNEL, "%s-irq", dev_name(dev)); if (!irq_chip->name) { - of_node_put(pcie_intc_node); - return -ENOMEM; + ret = -ENOMEM; + goto out_put_node; } irq_chip->irq_mask = advk_pcie_irq_mask; @@ -816,11 +817,13 @@ static int advk_pcie_init_irq_domain(struct advk_pcie *pcie) &advk_pcie_irq_domain_ops, pcie); if (!pcie->irq_domain) { dev_err(dev, "Failed to get a INTx IRQ domain\n"); - of_node_put(pcie_intc_node); - return -ENOMEM; + ret = -ENOMEM; + goto out_put_node; } - return 0; +out_put_node: + of_node_put(pcie_intc_node); + return ret; } static void advk_pcie_remove_irq_domain(struct advk_pcie *pcie) -- 2.32.0 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 49E30C433EF for ; Wed, 24 Nov 2021 22:51:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yMF/dLz6/gRSZ1O5uMrSjZfQmNBkDBiRz/Zk+jygOuA=; b=JzSqdPPUr2t5Vp zQbOFC4ThBe+o2d0HPCmau1+Jz8jhIQxExPs7k2cm6IDXLhDZJkas3xGKLiXA0wGDgDUqIWIJj2r6 1ZDbdERHw5tfnnVBK4maoxwSpPk0xZoKWjCd0+wwazMvXjpjRVwJLn48Cjzi7rIAzUvHyBU6y3sS9 WbkgJsQZYZo5JQmLKkmW1pjbel6hdVSl5MZaMI36+MeqqdG0A2HyPbWN9ejxiTvltQ7q0gV9CogI1 gFOrVIIlryzoCH6Q5DdYHieGGOokf4679mIs9g35AHO1gtbwIETuAK0iJ9dbaKJREJPLlrZv6lMfP VRXH/QAk1YPwX3BDCqzg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mq15P-005z0E-Vt; Wed, 24 Nov 2021 22:49:56 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mq15M-005yzO-11 for linux-arm-kernel@lists.infradead.org; Wed, 24 Nov 2021 22:49:53 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1A48661074; Wed, 24 Nov 2021 22:49:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1637794189; bh=lkmT5oUlkagVlqjx9WivqLmmqv3j4oR0Fkd27SiI9C8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jb4E+Qe5UZqAUcdCXVzrgNg6QELBAq/wZCszFsb7f7PD5iPp4idomPWsS0TK5HXzI xjt5FrWxfRGhd80jw2nAH90/s6GRBebFKW3XbS7DxZkjhSNPn3WX8OnEb1IeteanOW x8F9njdXS+z1vjYD0jvWqxVHk1TebD2ojpZb1jA8m0eMPz4sJ6CFaOGJXo6adqnf2e nYeD2PigtsY/eprAhUrsqaE7MBusY1UlTTUiJfYJc0W0sJeErTTmOduCX7blzWoeRV 8aIb3oNxgZ0nsemC+D0BY8DDoAE02ZNfxOo516EOI92n0Hd8nsH9MUeQKCc/SyN7mo EfEvIxkP9smkA== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Greg Kroah-Hartman , Sasha Levin Cc: pali@kernel.org, stable@vger.kernel.org, Wen Yang , Lorenzo Pieralisi , Thomas Petazzoni , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 4.14 02/24] PCI: aardvark: Fix a leaked reference by adding missing of_node_put() Date: Wed, 24 Nov 2021 23:49:11 +0100 Message-Id: <20211124224933.24275-3-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211124224933.24275-1-kabel@kernel.org> References: <20211124224933.24275-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211124_144952_140332_A995FB97 X-CRM114-Status: GOOD ( 13.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogV2VuIFlhbmcgPHdlbi55YW5nOTlAenRlLmNvbS5jbj4KCmNvbW1pdCAzODQyZjUxNjZi ZjFlZjI4NmZlN2EzOWYyNjJiNWM5NTgxMzA4MzY2IHVwc3RyZWFtLgoKVGhlIGNhbGwgdG8gb2Zf Z2V0X25leHRfY2hpbGQoKSByZXR1cm5zIGEgbm9kZSBwb2ludGVyIHdpdGggcmVmY291bnQKaW5j cmVtZW50ZWQgdGh1cyBpdCBtdXN0IGJlIGV4cGxpY2l0bHkgZGVjcmVtZW50ZWQgYWZ0ZXIgdGhl IGxhc3QKdXNhZ2UuCgppcnFfZG9tYWluX2FkZF9saW5lYXIoKSBhbHNvIGNhbGxzIG9mX25vZGVf Z2V0KCkgdG8gaW5jcmVhc2UgcmVmY291bnQsCnNvIGlycV9kb21haW4gd2lsbCBub3QgYmUgYWZm ZWN0ZWQgd2hlbiBpdCBpcyByZWxlYXNlZC4KCkRldGVjdGVkIGJ5IGNvY2NpbmVsbGUgd2l0aCB0 aGUgZm9sbG93aW5nIHdhcm5pbmdzOgogIC4vZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktYWFy ZHZhcmsuYzo4MjY6MS03OiBFUlJPUjogbWlzc2luZyBvZl9ub2RlX3B1dDsgYWNxdWlyZWQgYSBu b2RlIHBvaW50ZXIgd2l0aCByZWZjb3VudCBpbmNyZW1lbnRlZCBvbiBsaW5lIDc5OCwgYnV0IHdp dGhvdXQgYSBjb3JyZXNwb25kaW5nIG9iamVjdCByZWxlYXNlIHdpdGhpbiB0aGlzIGZ1bmN0aW9u LgoKU2lnbmVkLW9mZi1ieTogV2VuIFlhbmcgPHdlbi55YW5nOTlAenRlLmNvbS5jbj4KU2lnbmVk LW9mZi1ieTogTG9yZW56byBQaWVyYWxpc2kgPGxvcmVuem8ucGllcmFsaXNpQGFybS5jb20+CkNj OiBUaG9tYXMgUGV0YXp6b25pIDx0aG9tYXMucGV0YXp6b25pQGJvb3RsaW4uY29tPgpDYzogTG9y ZW56byBQaWVyYWxpc2kgPGxvcmVuem8ucGllcmFsaXNpQGFybS5jb20+CkNjOiBCam9ybiBIZWxn YWFzIDxiaGVsZ2Fhc0Bnb29nbGUuY29tPgpDYzogbGludXgtcGNpQHZnZXIua2VybmVsLm9yZwpD YzogbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRlYWQub3JnCkNjOiBsaW51eC1rZXJuZWxA dmdlci5rZXJuZWwub3JnClNpZ25lZC1vZmYtYnk6IE1hcmVrIEJlaMO6biA8a2FiZWxAa2VybmVs Lm9yZz4KLS0tCiBkcml2ZXJzL3BjaS9ob3N0L3BjaS1hYXJkdmFyay5jIHwgMTMgKysrKysrKyst LS0tLQogMSBmaWxlIGNoYW5nZWQsIDggaW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL3BjaS9ob3N0L3BjaS1hYXJkdmFyay5jIGIvZHJpdmVycy9wY2kv aG9zdC9wY2ktYWFyZHZhcmsuYwppbmRleCBmZDYwNTc5NmIwMTEuLjc5Y2QxMWIxYzg5YSAxMDA2 NDQKLS0tIGEvZHJpdmVycy9wY2kvaG9zdC9wY2ktYWFyZHZhcmsuYworKysgYi9kcml2ZXJzL3Bj aS9ob3N0L3BjaS1hYXJkdmFyay5jCkBAIC03ODksNiArNzg5LDcgQEAgc3RhdGljIGludCBhZHZr X3BjaWVfaW5pdF9pcnFfZG9tYWluKHN0cnVjdCBhZHZrX3BjaWUgKnBjaWUpCiAJc3RydWN0IGRl dmljZV9ub2RlICpub2RlID0gZGV2LT5vZl9ub2RlOwogCXN0cnVjdCBkZXZpY2Vfbm9kZSAqcGNp ZV9pbnRjX25vZGU7CiAJc3RydWN0IGlycV9jaGlwICppcnFfY2hpcDsKKwlpbnQgcmV0ID0gMDsK IAogCXJhd19zcGluX2xvY2tfaW5pdCgmcGNpZS0+aXJxX2xvY2spOwogCkBAIC04MDMsOCArODA0 LDggQEAgc3RhdGljIGludCBhZHZrX3BjaWVfaW5pdF9pcnFfZG9tYWluKHN0cnVjdCBhZHZrX3Bj aWUgKnBjaWUpCiAJaXJxX2NoaXAtPm5hbWUgPSBkZXZtX2thc3ByaW50ZihkZXYsIEdGUF9LRVJO RUwsICIlcy1pcnEiLAogCQkJCQlkZXZfbmFtZShkZXYpKTsKIAlpZiAoIWlycV9jaGlwLT5uYW1l KSB7Ci0JCW9mX25vZGVfcHV0KHBjaWVfaW50Y19ub2RlKTsKLQkJcmV0dXJuIC1FTk9NRU07CisJ CXJldCA9IC1FTk9NRU07CisJCWdvdG8gb3V0X3B1dF9ub2RlOwogCX0KIAogCWlycV9jaGlwLT5p cnFfbWFzayA9IGFkdmtfcGNpZV9pcnFfbWFzazsKQEAgLTgxNiwxMSArODE3LDEzIEBAIHN0YXRp YyBpbnQgYWR2a19wY2llX2luaXRfaXJxX2RvbWFpbihzdHJ1Y3QgYWR2a19wY2llICpwY2llKQog CQkJCSAgICAgICZhZHZrX3BjaWVfaXJxX2RvbWFpbl9vcHMsIHBjaWUpOwogCWlmICghcGNpZS0+ aXJxX2RvbWFpbikgewogCQlkZXZfZXJyKGRldiwgIkZhaWxlZCB0byBnZXQgYSBJTlR4IElSUSBk b21haW5cbiIpOwotCQlvZl9ub2RlX3B1dChwY2llX2ludGNfbm9kZSk7Ci0JCXJldHVybiAtRU5P TUVNOworCQlyZXQgPSAtRU5PTUVNOworCQlnb3RvIG91dF9wdXRfbm9kZTsKIAl9CiAKLQlyZXR1 cm4gMDsKK291dF9wdXRfbm9kZToKKwlvZl9ub2RlX3B1dChwY2llX2ludGNfbm9kZSk7CisJcmV0 dXJuIHJldDsKIH0KIAogc3RhdGljIHZvaWQgYWR2a19wY2llX3JlbW92ZV9pcnFfZG9tYWluKHN0 cnVjdCBhZHZrX3BjaWUgKnBjaWUpCi0tIAoyLjMyLjAKCgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxpbmcgbGlzdAps aW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3RzLmluZnJhZGVh ZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==