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 BBCEEC433FE for ; Mon, 29 Nov 2021 18:22:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351084AbhK2SZq (ORCPT ); Mon, 29 Nov 2021 13:25:46 -0500 Received: from sin.source.kernel.org ([145.40.73.55]:47108 "EHLO sin.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229683AbhK2SXp (ORCPT ); Mon, 29 Nov 2021 13:23:45 -0500 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 sin.source.kernel.org (Postfix) with ESMTPS id 85439CE13D7; Mon, 29 Nov 2021 18:20:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EF96C53FAD; Mon, 29 Nov 2021 18:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1638210024; bh=GZGDxE8s+2V561z3QS8z0po771bfpbHBVhYMNFTZPXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mdRIBtvTmf88vjKsGmMH9hHm+a/vb274PqujYc45fWeJ+2D/XfPivh3HfEdViVr9u uGJYOPYnk4jmyK45kkr9b+IO7KxWUpvCKzKI9dpfgxLC/mNVhjXo8gXMGO4yGVq6xp fcVsa8a4sJv1MAIaQaKDD3DzIoMrZwMsOgv84pao= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wen Yang , Lorenzo Pieralisi , Thomas Petazzoni , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 4.19 17/69] PCI: aardvark: Fix a leaked reference by adding missing of_node_put() Date: Mon, 29 Nov 2021 19:17:59 +0100 Message-Id: <20211129181704.225629103@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211129181703.670197996@linuxfoundation.org> References: <20211129181703.670197996@linuxfoundation.org> User-Agent: quilt/0.66 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 Signed-off-by: Greg Kroah-Hartman --- drivers/pci/controller/pci-aardvark.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -754,6 +754,7 @@ static int advk_pcie_init_irq_domain(str 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); @@ -768,8 +769,8 @@ static int advk_pcie_init_irq_domain(str 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; @@ -781,11 +782,13 @@ static int advk_pcie_init_irq_domain(str &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) 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 B8F4BC433F5 for ; Mon, 29 Nov 2021 18:22:04 +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=G9eTLfi1p/8F3MZRjbrbJ8JoIpQDS6t5lg5dPpevuGo=; b=WJ67TwhUQMFDHj /JvAduuRW4QA+CNOULH0rUPEJ3uwd2vLLxCIl+aaT7MCp2k1s/enRi5bzeREHJNkMFIdnMaXGXKA/ Jy/96xOXTzWduePKnjcFlHS/z4adygyxIy8hhMLIJ8Zj16UrgtoJM5QBQbJ4Tx6rO1ZYBTsEDxoMS X6Vir09iSLtkMrnu+YFLCVAxrG5hYq6ujy7TJ+mkXZr04jxa1jH3P3Lhy1/jIWY+bKn4W8xUN8IUl 1Ciu+sxc2axg7PYwJ0hTmvDsxyb0pFpde8Kqgw9//iMUubffMbipeKkNBbSP8a97Bkv5Z3+ETmTUA OjfEKPWOQbzBktVqNn5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrlGS-001kAE-JV; Mon, 29 Nov 2021 18:20:32 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mrlGO-001k9P-SP for linux-arm-kernel@lists.infradead.org; Mon, 29 Nov 2021 18:20:30 +0000 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 sin.source.kernel.org (Postfix) with ESMTPS id 82DB6CE13D5; Mon, 29 Nov 2021 18:20:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EF96C53FAD; Mon, 29 Nov 2021 18:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1638210024; bh=GZGDxE8s+2V561z3QS8z0po771bfpbHBVhYMNFTZPXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mdRIBtvTmf88vjKsGmMH9hHm+a/vb274PqujYc45fWeJ+2D/XfPivh3HfEdViVr9u uGJYOPYnk4jmyK45kkr9b+IO7KxWUpvCKzKI9dpfgxLC/mNVhjXo8gXMGO4yGVq6xp fcVsa8a4sJv1MAIaQaKDD3DzIoMrZwMsOgv84pao= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wen Yang , Lorenzo Pieralisi , Thomas Petazzoni , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 4.19 17/69] PCI: aardvark: Fix a leaked reference by adding missing of_node_put() Date: Mon, 29 Nov 2021 19:17:59 +0100 Message-Id: <20211129181704.225629103@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211129181703.670197996@linuxfoundation.org> References: <20211129181703.670197996@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211129_102029_137031_E4837415 X-CRM114-Status: GOOD ( 15.14 ) 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 Lm9yZz4KU2lnbmVkLW9mZi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3Vu ZGF0aW9uLm9yZz4KLS0tCiBkcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1hYXJkdmFyay5jIHwg ICAxMyArKysrKysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgOCBpbnNlcnRpb25zKCspLCA1IGRl bGV0aW9ucygtKQoKLS0tIGEvZHJpdmVycy9wY2kvY29udHJvbGxlci9wY2ktYWFyZHZhcmsuYwor KysgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1hYXJkdmFyay5jCkBAIC03NTQsNiArNzU0 LDcgQEAgc3RhdGljIGludCBhZHZrX3BjaWVfaW5pdF9pcnFfZG9tYWluKHN0cgogCXN0cnVjdCBk ZXZpY2Vfbm9kZSAqbm9kZSA9IGRldi0+b2Zfbm9kZTsKIAlzdHJ1Y3QgZGV2aWNlX25vZGUgKnBj aWVfaW50Y19ub2RlOwogCXN0cnVjdCBpcnFfY2hpcCAqaXJxX2NoaXA7CisJaW50IHJldCA9IDA7 CiAKIAlyYXdfc3Bpbl9sb2NrX2luaXQoJnBjaWUtPmlycV9sb2NrKTsKIApAQCAtNzY4LDggKzc2 OSw4IEBAIHN0YXRpYyBpbnQgYWR2a19wY2llX2luaXRfaXJxX2RvbWFpbihzdHIKIAlpcnFfY2hp cC0+bmFtZSA9IGRldm1fa2FzcHJpbnRmKGRldiwgR0ZQX0tFUk5FTCwgIiVzLWlycSIsCiAJCQkJ CWRldl9uYW1lKGRldikpOwogCWlmICghaXJxX2NoaXAtPm5hbWUpIHsKLQkJb2Zfbm9kZV9wdXQo cGNpZV9pbnRjX25vZGUpOwotCQlyZXR1cm4gLUVOT01FTTsKKwkJcmV0ID0gLUVOT01FTTsKKwkJ Z290byBvdXRfcHV0X25vZGU7CiAJfQogCiAJaXJxX2NoaXAtPmlycV9tYXNrID0gYWR2a19wY2ll X2lycV9tYXNrOwpAQCAtNzgxLDExICs3ODIsMTMgQEAgc3RhdGljIGludCBhZHZrX3BjaWVfaW5p dF9pcnFfZG9tYWluKHN0cgogCQkJCSAgICAgICZhZHZrX3BjaWVfaXJxX2RvbWFpbl9vcHMsIHBj aWUpOwogCWlmICghcGNpZS0+aXJxX2RvbWFpbikgewogCQlkZXZfZXJyKGRldiwgIkZhaWxlZCB0 byBnZXQgYSBJTlR4IElSUSBkb21haW5cbiIpOwotCQlvZl9ub2RlX3B1dChwY2llX2ludGNfbm9k ZSk7Ci0JCXJldHVybiAtRU5PTUVNOworCQlyZXQgPSAtRU5PTUVNOworCQlnb3RvIG91dF9wdXRf bm9kZTsKIAl9CiAKLQlyZXR1cm4gMDsKK291dF9wdXRfbm9kZToKKwlvZl9ub2RlX3B1dChwY2ll X2ludGNfbm9kZSk7CisJcmV0dXJuIHJldDsKIH0KIAogc3RhdGljIHZvaWQgYWR2a19wY2llX3Jl bW92ZV9pcnFfZG9tYWluKHN0cnVjdCBhZHZrX3BjaWUgKnBjaWUpCgoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGlu ZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMu aW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK