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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 2F23DC432C1 for ; Tue, 24 Sep 2019 16:46:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 05BB921971 for ; Tue, 24 Sep 2019 16:46:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569343586; bh=qqZxm8KNU3bkkqJKEYWUqs8sTqIDkTaNn9u3huRE85Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=EPYpmb9pbYAR6Fv4ArxROGczW6+m3tF306A/t1ZI9P14AtNoWIfwsfTJCq5NdN+3M wiXy5BPgDALpCVC260jPEslyHJeVtGdXimYTyBSIHfIgZia2/ZMVjlNL2sZslMCFoo 2hGmNCQqz7WcwTZ5NTuaGfpk3+7JNJF6lfZaIaG0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2410108AbfIXQqS (ORCPT ); Tue, 24 Sep 2019 12:46:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:36706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728428AbfIXQqN (ORCPT ); Tue, 24 Sep 2019 12:46:13 -0400 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 5366F21841; Tue, 24 Sep 2019 16:46:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569343573; bh=qqZxm8KNU3bkkqJKEYWUqs8sTqIDkTaNn9u3huRE85Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bUsQk9/UfwheQ33KEy2tM3Vbh0YYoVHvndjrxdWjQP4q66Edowx9zKqgk9WZyu3t7 8phfaoR4mUrGDUG+zCFxFC5MdTWBtmgdsi37RYqCkZBgt1WY3jXHAghUhCux9G/Jf5 x6VJRc+bkBbut8kGg/Gz7pxY6tBZPLHpkbncORG8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Navid Emamdoost , Sam Ravnborg , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 5.2 11/70] drm/panel: check failure cases in the probe func Date: Tue, 24 Sep 2019 12:44:50 -0400 Message-Id: <20190924164549.27058-11-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924164549.27058-1-sashal@kernel.org> References: <20190924164549.27058-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review 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: Navid Emamdoost [ Upstream commit afd6d4f5a52c16e1483328ac074abb1cde92c29f ] The following function calls may fail and return NULL, so the null check is added. of_graph_get_next_endpoint of_graph_get_remote_port_parent of_graph_get_remote_port Update: Thanks to Sam Ravnborg, for suggession on the use of goto to avoid leaking endpoint. Signed-off-by: Navid Emamdoost Signed-off-by: Sam Ravnborg Link: https://patchwork.freedesktop.org/patch/msgid/20190724195534.9303-1-navid.emamdoost@gmail.com Signed-off-by: Sasha Levin --- .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c index 2c9c9722734f5..9a2cb8aeab3a4 100644 --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c @@ -400,7 +400,13 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c, /* Look up the DSI host. It needs to probe before we do. */ endpoint = of_graph_get_next_endpoint(dev->of_node, NULL); + if (!endpoint) + return -ENODEV; + dsi_host_node = of_graph_get_remote_port_parent(endpoint); + if (!dsi_host_node) + goto error; + host = of_find_mipi_dsi_host_by_node(dsi_host_node); of_node_put(dsi_host_node); if (!host) { @@ -409,6 +415,9 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c, } info.node = of_graph_get_remote_port(endpoint); + if (!info.node) + goto error; + of_node_put(endpoint); ts->dsi = mipi_dsi_device_register_full(host, &info); @@ -429,6 +438,10 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c, return ret; return 0; + +error: + of_node_put(endpoint); + return -ENODEV; } static int rpi_touchscreen_remove(struct i2c_client *i2c) -- 2.20.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.2 11/70] drm/panel: check failure cases in the probe func Date: Tue, 24 Sep 2019 12:44:50 -0400 Message-ID: <20190924164549.27058-11-sashal@kernel.org> References: <20190924164549.27058-1-sashal@kernel.org> 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 2E4A06EA88 for ; Tue, 24 Sep 2019 16:46:13 +0000 (UTC) In-Reply-To: <20190924164549.27058-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 , Sam Ravnborg , dri-devel@lists.freedesktop.org, Navid Emamdoost List-Id: dri-devel@lists.freedesktop.org RnJvbTogTmF2aWQgRW1hbWRvb3N0IDxuYXZpZC5lbWFtZG9vc3RAZ21haWwuY29tPgoKWyBVcHN0 cmVhbSBjb21taXQgYWZkNmQ0ZjVhNTJjMTZlMTQ4MzMyOGFjMDc0YWJiMWNkZTkyYzI5ZiBdCgpU aGUgZm9sbG93aW5nIGZ1bmN0aW9uIGNhbGxzIG1heSBmYWlsIGFuZCByZXR1cm4gTlVMTCwgc28g dGhlIG51bGwgY2hlY2sKaXMgYWRkZWQuCm9mX2dyYXBoX2dldF9uZXh0X2VuZHBvaW50Cm9mX2dy YXBoX2dldF9yZW1vdGVfcG9ydF9wYXJlbnQKb2ZfZ3JhcGhfZ2V0X3JlbW90ZV9wb3J0CgpVcGRh dGU6IFRoYW5rcyB0byBTYW0gUmF2bmJvcmcsIGZvciBzdWdnZXNzaW9uIG9uIHRoZSB1c2Ugb2Yg Z290byB0byBhdm9pZApsZWFraW5nIGVuZHBvaW50LgoKU2lnbmVkLW9mZi1ieTogTmF2aWQgRW1h bWRvb3N0IDxuYXZpZC5lbWFtZG9vc3RAZ21haWwuY29tPgpTaWduZWQtb2ZmLWJ5OiBTYW0gUmF2 bmJvcmcgPHNhbUByYXZuYm9yZy5vcmc+Ckxpbms6IGh0dHBzOi8vcGF0Y2h3b3JrLmZyZWVkZXNr dG9wLm9yZy9wYXRjaC9tc2dpZC8yMDE5MDcyNDE5NTUzNC45MzAzLTEtbmF2aWQuZW1hbWRvb3N0 QGdtYWlsLmNvbQpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5vcmc+ Ci0tLQogLi4uL2dwdS9kcm0vcGFuZWwvcGFuZWwtcmFzcGJlcnJ5cGktdG91Y2hzY3JlZW4uYyAg IHwgMTMgKysrKysrKysrKysrKwogMSBmaWxlIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKykKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vcGFuZWwvcGFuZWwtcmFzcGJlcnJ5cGktdG91Y2hz Y3JlZW4uYyBiL2RyaXZlcnMvZ3B1L2RybS9wYW5lbC9wYW5lbC1yYXNwYmVycnlwaS10b3VjaHNj cmVlbi5jCmluZGV4IDJjOWM5NzIyNzM0ZjUuLjlhMmNiOGFlYWIzYTQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvZ3B1L2RybS9wYW5lbC9wYW5lbC1yYXNwYmVycnlwaS10b3VjaHNjcmVlbi5jCisrKyBi L2RyaXZlcnMvZ3B1L2RybS9wYW5lbC9wYW5lbC1yYXNwYmVycnlwaS10b3VjaHNjcmVlbi5jCkBA IC00MDAsNyArNDAwLDEzIEBAIHN0YXRpYyBpbnQgcnBpX3RvdWNoc2NyZWVuX3Byb2JlKHN0cnVj dCBpMmNfY2xpZW50ICppMmMsCiAKIAkvKiBMb29rIHVwIHRoZSBEU0kgaG9zdC4gIEl0IG5lZWRz IHRvIHByb2JlIGJlZm9yZSB3ZSBkby4gKi8KIAllbmRwb2ludCA9IG9mX2dyYXBoX2dldF9uZXh0 X2VuZHBvaW50KGRldi0+b2Zfbm9kZSwgTlVMTCk7CisJaWYgKCFlbmRwb2ludCkKKwkJcmV0dXJu IC1FTk9ERVY7CisKIAlkc2lfaG9zdF9ub2RlID0gb2ZfZ3JhcGhfZ2V0X3JlbW90ZV9wb3J0X3Bh cmVudChlbmRwb2ludCk7CisJaWYgKCFkc2lfaG9zdF9ub2RlKQorCQlnb3RvIGVycm9yOworCiAJ aG9zdCA9IG9mX2ZpbmRfbWlwaV9kc2lfaG9zdF9ieV9ub2RlKGRzaV9ob3N0X25vZGUpOwogCW9m X25vZGVfcHV0KGRzaV9ob3N0X25vZGUpOwogCWlmICghaG9zdCkgewpAQCAtNDA5LDYgKzQxNSw5 IEBAIHN0YXRpYyBpbnQgcnBpX3RvdWNoc2NyZWVuX3Byb2JlKHN0cnVjdCBpMmNfY2xpZW50ICpp MmMsCiAJfQogCiAJaW5mby5ub2RlID0gb2ZfZ3JhcGhfZ2V0X3JlbW90ZV9wb3J0KGVuZHBvaW50 KTsKKwlpZiAoIWluZm8ubm9kZSkKKwkJZ290byBlcnJvcjsKKwogCW9mX25vZGVfcHV0KGVuZHBv aW50KTsKIAogCXRzLT5kc2kgPSBtaXBpX2RzaV9kZXZpY2VfcmVnaXN0ZXJfZnVsbChob3N0LCAm aW5mbyk7CkBAIC00MjksNiArNDM4LDEwIEBAIHN0YXRpYyBpbnQgcnBpX3RvdWNoc2NyZWVuX3By b2JlKHN0cnVjdCBpMmNfY2xpZW50ICppMmMsCiAJCXJldHVybiByZXQ7CiAKIAlyZXR1cm4gMDsK KworZXJyb3I6CisJb2Zfbm9kZV9wdXQoZW5kcG9pbnQpOworCXJldHVybiAtRU5PREVWOwogfQog CiBzdGF0aWMgaW50IHJwaV90b3VjaHNjcmVlbl9yZW1vdmUoc3RydWN0IGkyY19jbGllbnQgKmky YykKLS0gCjIuMjAuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRl dmVs