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 X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 995EAC282CA for ; Wed, 13 Feb 2019 02:40:38 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 6709A222C2 for ; Wed, 13 Feb 2019 02:40:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VDVj9FsV"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="BQINJi8r" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6709A222C2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vq0P1uAI+VCdJwHXx9xVhNySEyOdqzW7Tn91zHLuLqk=; b=VDVj9FsVIN/ULb Sq1NVRVbPRph+5ja8GTtjut3VnaLuKAIDZlJBsm2I1VOGvo5vYENWIobeY1Eb+Gv0a9y8lLHUp0IX rPiPuhkPkmV+5gKjYn5HBtxAIsj3PottbZnpqZ957Wq5TlaJpw9MVjJ8UIRz5auFy5drLzf8jxXaF kjAHN6aPq0nSABuykZ+QpixVZw2GV6k6SVbn0gR+TMDTLv0y3qkzdxLGlqlFK+ihUw0jOiuO6l+rN hSP2SqzlPjZCWw95BSkYgMdhfEnOSlNUcHYEIXvtAAij0KQjU94Jsn0dHPYC+i0IaBt4smUOwew1g GN/zba5rM1zz3ironPmA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtkTR-00047H-9s; Wed, 13 Feb 2019 02:40:33 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtkTO-00046x-HQ for linux-amlogic@lists.infradead.org; Wed, 13 Feb 2019 02:40:32 +0000 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6F902222C2; Wed, 13 Feb 2019 02:40:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025630; bh=i0Gho9LR7kLGRs0OK5eAqk15IXsGCyyoqPzUUEUFq3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BQINJi8rO5vVqx9YAOwd9pKRCaKpS8yKNE37U9KmTUfRsdQE242bWGay3M46gcStq TBUuoeKqVYOcW5I2cPbXETOZ9Dc9F1L5u8gUO9GCfphUq/hi6s0f/47j89FCuHz7ZZ hzaRlslN5mc+3XRbhBw071yz6n7Fhpk/Bo4NGcAg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 27/34] drm/meson: add missing of_node_put Date: Tue, 12 Feb 2019 21:39:45 -0500 Message-Id: <20190213023952.21311-27-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213023952.21311-1-sashal@kernel.org> References: <20190213023952.21311-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190212_184030_601861_ADF7CC87 X-CRM114-Status: GOOD ( 11.25 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Julia Lawall , linux-amlogic@lists.infradead.org, dri-devel@lists.freedesktop.org, Neil Armstrong Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org From: Julia Lawall [ Upstream commit f672b93e4a0a4947d2e1103ed8780e01e13eadb6 ] Add an of_node_put when the result of of_graph_get_remote_port_parent is not available. An of_node_put is also needed when meson_probe_remote completes. This was present at the recursive call, but not in the call from meson_drv_probe. The semantic match that finds this problem is as follows (http://coccinelle.lip6.fr): // @r exists@ local idexpression e; expression x; @@ e = of_graph_get_remote_port_parent(...); ... when != x = e when != true e == NULL when != of_node_put(e) when != of_fwnode_handle(e) ( return e; | *return ...; ) // Signed-off-by: Julia Lawall Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/1547372691-28324-4-git-send-email-Julia.Lawall@lip6.fr Signed-off-by: Sasha Levin --- drivers/gpu/drm/meson/meson_drv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 4ad8223c60ea..5deb44ac6791 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -345,8 +345,10 @@ static int meson_probe_remote(struct platform_device *pdev, remote_node = of_graph_get_remote_port_parent(ep); if (!remote_node || remote_node == parent || /* Ignore parent endpoint */ - !of_device_is_available(remote_node)) + !of_device_is_available(remote_node)) { + of_node_put(remote_node); continue; + } count += meson_probe_remote(pdev, match, remote, remote_node); @@ -365,10 +367,13 @@ static int meson_drv_probe(struct platform_device *pdev) for_each_endpoint_of_node(np, ep) { remote = of_graph_get_remote_port_parent(ep); - if (!remote || !of_device_is_available(remote)) + if (!remote || !of_device_is_available(remote)) { + of_node_put(remote); continue; + } count += meson_probe_remote(pdev, &match, np, remote); + of_node_put(remote); } if (count && !match) -- 2.19.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin via dri-devel Subject: [PATCH AUTOSEL 4.14 27/34] drm/meson: add missing of_node_put Date: Tue, 12 Feb 2019 21:39:45 -0500 Message-ID: <20190213023952.21311-27-sashal@kernel.org> References: <20190213023952.21311-1-sashal@kernel.org> Reply-To: Sasha Levin Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 703A66E603 for ; Wed, 13 Feb 2019 02:40:30 +0000 (UTC) In-Reply-To: <20190213023952.21311-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , Julia Lawall , linux-amlogic@lists.infradead.org, dri-devel@lists.freedesktop.org, Neil Armstrong List-Id: dri-devel@lists.freedesktop.org RnJvbTogSnVsaWEgTGF3YWxsIDxKdWxpYS5MYXdhbGxAbGlwNi5mcj4KClsgVXBzdHJlYW0gY29t bWl0IGY2NzJiOTNlNGEwYTQ5NDdkMmUxMTAzZWQ4NzgwZTAxZTEzZWFkYjYgXQoKQWRkIGFuIG9m X25vZGVfcHV0IHdoZW4gdGhlIHJlc3VsdCBvZiBvZl9ncmFwaF9nZXRfcmVtb3RlX3BvcnRfcGFy ZW50IGlzCm5vdCBhdmFpbGFibGUuCgpBbiBvZl9ub2RlX3B1dCBpcyBhbHNvIG5lZWRlZCB3aGVu IG1lc29uX3Byb2JlX3JlbW90ZSBjb21wbGV0ZXMuICBUaGlzIHdhcwpwcmVzZW50IGF0IHRoZSBy ZWN1cnNpdmUgY2FsbCwgYnV0IG5vdCBpbiB0aGUgY2FsbCBmcm9tIG1lc29uX2Rydl9wcm9iZS4K ClRoZSBzZW1hbnRpYyBtYXRjaCB0aGF0IGZpbmRzIHRoaXMgcHJvYmxlbSBpcyBhcyBmb2xsb3dz CihodHRwOi8vY29jY2luZWxsZS5saXA2LmZyKToKCi8vIDxzbXBsPgpAciBleGlzdHNACmxvY2Fs IGlkZXhwcmVzc2lvbiBlOwpleHByZXNzaW9uIHg7CkBACmUgPSBvZl9ncmFwaF9nZXRfcmVtb3Rl X3BvcnRfcGFyZW50KC4uLik7Ci4uLiB3aGVuICE9IHggPSBlCiAgICB3aGVuICE9IHRydWUgZSA9 PSBOVUxMCiAgICB3aGVuICE9IG9mX25vZGVfcHV0KGUpCiAgICB3aGVuICE9IG9mX2Z3bm9kZV9o YW5kbGUoZSkKKApyZXR1cm4gZTsKfAoqcmV0dXJuIC4uLjsKKQovLyA8L3NtcGw+CgpTaWduZWQt b2ZmLWJ5OiBKdWxpYSBMYXdhbGwgPEp1bGlhLkxhd2FsbEBsaXA2LmZyPgpBY2tlZC1ieTogTmVp bCBBcm1zdHJvbmcgPG5hcm1zdHJvbmdAYmF5bGlicmUuY29tPgpTaWduZWQtb2ZmLWJ5OiBOZWls IEFybXN0cm9uZyA8bmFybXN0cm9uZ0BiYXlsaWJyZS5jb20+Ckxpbms6IGh0dHBzOi8vcGF0Y2h3 b3JrLmZyZWVkZXNrdG9wLm9yZy9wYXRjaC9tc2dpZC8xNTQ3MzcyNjkxLTI4MzI0LTQtZ2l0LXNl bmQtZW1haWwtSnVsaWEuTGF3YWxsQGxpcDYuZnIKU2lnbmVkLW9mZi1ieTogU2FzaGEgTGV2aW4g PHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9kcnYu YyB8IDkgKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNlcnRpb25zKCspLCAyIGRlbGV0 aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9kcnYuYyBi L2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9kcnYuYwppbmRleCA0YWQ4MjIzYzYwZWEuLjVk ZWI0NGFjNjc5MSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL21lc29uL21lc29uX2Rydi5j CisrKyBiL2RyaXZlcnMvZ3B1L2RybS9tZXNvbi9tZXNvbl9kcnYuYwpAQCAtMzQ1LDggKzM0NSwx MCBAQCBzdGF0aWMgaW50IG1lc29uX3Byb2JlX3JlbW90ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNl ICpwZGV2LAogCQlyZW1vdGVfbm9kZSA9IG9mX2dyYXBoX2dldF9yZW1vdGVfcG9ydF9wYXJlbnQo ZXApOwogCQlpZiAoIXJlbW90ZV9ub2RlIHx8CiAJCSAgICByZW1vdGVfbm9kZSA9PSBwYXJlbnQg fHwgLyogSWdub3JlIHBhcmVudCBlbmRwb2ludCAqLwotCQkgICAgIW9mX2RldmljZV9pc19hdmFp bGFibGUocmVtb3RlX25vZGUpKQorCQkgICAgIW9mX2RldmljZV9pc19hdmFpbGFibGUocmVtb3Rl X25vZGUpKSB7CisJCQlvZl9ub2RlX3B1dChyZW1vdGVfbm9kZSk7CiAJCQljb250aW51ZTsKKwkJ fQogCiAJCWNvdW50ICs9IG1lc29uX3Byb2JlX3JlbW90ZShwZGV2LCBtYXRjaCwgcmVtb3RlLCBy ZW1vdGVfbm9kZSk7CiAKQEAgLTM2NSwxMCArMzY3LDEzIEBAIHN0YXRpYyBpbnQgbWVzb25fZHJ2 X3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAKIAlmb3JfZWFjaF9lbmRwb2lu dF9vZl9ub2RlKG5wLCBlcCkgewogCQlyZW1vdGUgPSBvZl9ncmFwaF9nZXRfcmVtb3RlX3BvcnRf cGFyZW50KGVwKTsKLQkJaWYgKCFyZW1vdGUgfHwgIW9mX2RldmljZV9pc19hdmFpbGFibGUocmVt b3RlKSkKKwkJaWYgKCFyZW1vdGUgfHwgIW9mX2RldmljZV9pc19hdmFpbGFibGUocmVtb3RlKSkg eworCQkJb2Zfbm9kZV9wdXQocmVtb3RlKTsKIAkJCWNvbnRpbnVlOworCQl9CiAKIAkJY291bnQg Kz0gbWVzb25fcHJvYmVfcmVtb3RlKHBkZXYsICZtYXRjaCwgbnAsIHJlbW90ZSk7CisJCW9mX25v ZGVfcHV0KHJlbW90ZSk7CiAJfQogCiAJaWYgKGNvdW50ICYmICFtYXRjaCkKLS0gCjIuMTkuMQoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6A71C282C4 for ; Wed, 13 Feb 2019 02:40:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 922DD222C2 for ; Wed, 13 Feb 2019 02:40:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025637; bh=i0Gho9LR7kLGRs0OK5eAqk15IXsGCyyoqPzUUEUFq3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=U4t6Rbt/ZMmVJgqLC9tHgngGGkvfYm7QMllGckZH+5NzWkKN087isbK69jZc4UKfM hubwkTDDZ0GYWTbJQibqqAqrSP5VL5nHnUIfSWYEMoYaxQhqFAuQPRYyMb59UJo1D3 jeiRAfeFie8QgjkbKEtFYEvvGu5CszRXEpdURdLI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389037AbfBMCkf (ORCPT ); Tue, 12 Feb 2019 21:40:35 -0500 Received: from mail.kernel.org ([198.145.29.99]:44212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389010AbfBMCkb (ORCPT ); Tue, 12 Feb 2019 21:40:31 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6F902222C2; Wed, 13 Feb 2019 02:40:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025630; bh=i0Gho9LR7kLGRs0OK5eAqk15IXsGCyyoqPzUUEUFq3c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BQINJi8rO5vVqx9YAOwd9pKRCaKpS8yKNE37U9KmTUfRsdQE242bWGay3M46gcStq TBUuoeKqVYOcW5I2cPbXETOZ9Dc9F1L5u8gUO9GCfphUq/hi6s0f/47j89FCuHz7ZZ hzaRlslN5mc+3XRbhBw071yz6n7Fhpk/Bo4NGcAg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Julia Lawall , Neil Armstrong , Sasha Levin , dri-devel@lists.freedesktop.org, linux-amlogic@lists.infradead.org Subject: [PATCH AUTOSEL 4.14 27/34] drm/meson: add missing of_node_put Date: Tue, 12 Feb 2019 21:39:45 -0500 Message-Id: <20190213023952.21311-27-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213023952.21311-1-sashal@kernel.org> References: <20190213023952.21311-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Julia Lawall [ Upstream commit f672b93e4a0a4947d2e1103ed8780e01e13eadb6 ] Add an of_node_put when the result of of_graph_get_remote_port_parent is not available. An of_node_put is also needed when meson_probe_remote completes. This was present at the recursive call, but not in the call from meson_drv_probe. The semantic match that finds this problem is as follows (http://coccinelle.lip6.fr): // @r exists@ local idexpression e; expression x; @@ e = of_graph_get_remote_port_parent(...); ... when != x = e when != true e == NULL when != of_node_put(e) when != of_fwnode_handle(e) ( return e; | *return ...; ) // Signed-off-by: Julia Lawall Acked-by: Neil Armstrong Signed-off-by: Neil Armstrong Link: https://patchwork.freedesktop.org/patch/msgid/1547372691-28324-4-git-send-email-Julia.Lawall@lip6.fr Signed-off-by: Sasha Levin --- drivers/gpu/drm/meson/meson_drv.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 4ad8223c60ea..5deb44ac6791 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -345,8 +345,10 @@ static int meson_probe_remote(struct platform_device *pdev, remote_node = of_graph_get_remote_port_parent(ep); if (!remote_node || remote_node == parent || /* Ignore parent endpoint */ - !of_device_is_available(remote_node)) + !of_device_is_available(remote_node)) { + of_node_put(remote_node); continue; + } count += meson_probe_remote(pdev, match, remote, remote_node); @@ -365,10 +367,13 @@ static int meson_drv_probe(struct platform_device *pdev) for_each_endpoint_of_node(np, ep) { remote = of_graph_get_remote_port_parent(ep); - if (!remote || !of_device_is_available(remote)) + if (!remote || !of_device_is_available(remote)) { + of_node_put(remote); continue; + } count += meson_probe_remote(pdev, &match, np, remote); + of_node_put(remote); } if (count && !match) -- 2.19.1