From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sam Ravnborg Subject: Re: [PATCH] drm/panel: check failure cases in the probe func Date: Wed, 24 Jul 2019 20:59:33 +0200 Message-ID: <20190724185933.GE22640@ravnborg.org> References: <20190724051700.GA22730@ravnborg.org> <20190724144845.4791-1-navid.emamdoost@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from asavdk4.altibox.net (asavdk4.altibox.net [109.247.116.15]) by gabe.freedesktop.org (Postfix) with ESMTPS id 26CDA6E629 for ; Wed, 24 Jul 2019 18:59:37 +0000 (UTC) Content-Disposition: inline In-Reply-To: <20190724144845.4791-1-navid.emamdoost@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Navid Emamdoost Cc: secalert@redhat.com, David Airlie , kjlu@umn.edu, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Thierry Reding , smccaman@umn.edu, emamd001@umn.edu List-Id: dri-devel@lists.freedesktop.org SGkgTmF2aWQuCgpUaGFua3MgZm9yIHlvdXIgcGF0Y2guCgpPbiBXZWQsIEp1bCAyNCwgMjAxOSBh dCAwOTo0ODo0NEFNIC0wNTAwLCBOYXZpZCBFbWFtZG9vc3Qgd3JvdGU6Cj4gVGhlIGZvbGxvd2lu ZyBmdW5jdGlvbiBjYWxscyBtYXkgZmFpbCBhbmQgcmV0dXJuIE5VTEwsIHNvIHRoZSBudWxsIGNo ZWNrCj4gaXMgYWRkZWQuCj4gb2ZfZ3JhcGhfZ2V0X25leHRfZW5kcG9pbnQKPiBvZl9ncmFwaF9n ZXRfcmVtb3RlX3BvcnRfcGFyZW50Cj4gb2ZfZ3JhcGhfZ2V0X3JlbW90ZV9wb3J0Cj4gCj4gU2ln bmVkLW9mZi1ieTogTmF2aWQgRW1hbWRvb3N0IDxuYXZpZC5lbWFtZG9vc3RAZ21haWwuY29tPgo+ IC0tLQo+ICBkcml2ZXJzL2dwdS9kcm0vcGFuZWwvcGFuZWwtcmFzcGJlcnJ5cGktdG91Y2hzY3Jl ZW4uYyB8IDkgKysrKysrKysrCj4gIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMoKykKPiAK PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL3BhbmVsL3BhbmVsLXJhc3BiZXJyeXBpLXRv dWNoc2NyZWVuLmMgYi9kcml2ZXJzL2dwdS9kcm0vcGFuZWwvcGFuZWwtcmFzcGJlcnJ5cGktdG91 Y2hzY3JlZW4uYwo+IGluZGV4IDI4YzA2MjBkZmUwZi4uOTQ4NGZkYjYwZjY4IDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvZ3B1L2RybS9wYW5lbC9wYW5lbC1yYXNwYmVycnlwaS10b3VjaHNjcmVlbi5j Cj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL3BhbmVsL3BhbmVsLXJhc3BiZXJyeXBpLXRvdWNoc2Ny ZWVuLmMKPiBAQCAtMzk5LDcgKzM5OSwxMyBAQCBzdGF0aWMgaW50IHJwaV90b3VjaHNjcmVlbl9w cm9iZShzdHJ1Y3QgaTJjX2NsaWVudCAqaTJjLAo+ICAKPiAgCS8qIExvb2sgdXAgdGhlIERTSSBo b3N0LiAgSXQgbmVlZHMgdG8gcHJvYmUgYmVmb3JlIHdlIGRvLiAqLwo+ICAJZW5kcG9pbnQgPSBv Zl9ncmFwaF9nZXRfbmV4dF9lbmRwb2ludChkZXYtPm9mX25vZGUsIE5VTEwpOwo+ICsJaWYgKCFl bmRwb2ludCkKPiArCQlyZXR1cm4gLUVOT0RFVjsKPiArCj4gIAlkc2lfaG9zdF9ub2RlID0gb2Zf Z3JhcGhfZ2V0X3JlbW90ZV9wb3J0X3BhcmVudChlbmRwb2ludCk7Cj4gKwlpZiAoIWRzaV9ob3N0 X25vZGUpCj4gKwkJcmV0dXJuIC1FTk9ERVY7Cj4gKwpJZiB3ZSByZXR1cm4gaGVyZSB3ZSB3aWxs IGxlYWsgZW5kcG9pbnQgLSBhIG9mX25vZGVfcHV0KCkgaXMgbWlzc2luZy4KVXNlIGdvdG8gdG8g cmV3aW5kIHRoZSBhbGxvY2F0aW9ucyBpbiB0aGUgYm90dG9tIG9mIHRoaXMgZnVuY3Rpb24uCgo+ ICAJaG9zdCA9IG9mX2ZpbmRfbWlwaV9kc2lfaG9zdF9ieV9ub2RlKGRzaV9ob3N0X25vZGUpOwo+ ICAJb2Zfbm9kZV9wdXQoZHNpX2hvc3Rfbm9kZSk7Cj4gIAlpZiAoIWhvc3QpIHsKPiBAQCAtNDA4 LDYgKzQxNCw5IEBAIHN0YXRpYyBpbnQgcnBpX3RvdWNoc2NyZWVuX3Byb2JlKHN0cnVjdCBpMmNf Y2xpZW50ICppMmMsCj4gIAl9Cj4gIAo+ICAJaW5mby5ub2RlID0gb2ZfZ3JhcGhfZ2V0X3JlbW90 ZV9wb3J0KGVuZHBvaW50KTsKPiArCWlmICghaW5mby5ub2RlKQo+ICsJCXJldHVybiAtRU5PREVW OwpIZXJlIHdlIGFsc28gbGVhayBlbmRwb2ludCwgYnV0IG5vdCBkc2lfaG9zdF9ub2RlIGFzIHdl IGFscmVhZHkgZGlkIGEKcHV0IGFib3ZlLgoKPiArCj4gIAlvZl9ub2RlX3B1dChlbmRwb2ludCk7 Cj4gIAo+ICAJdHMtPmRzaSA9IG1pcGlfZHNpX2RldmljZV9yZWdpc3Rlcl9mdWxsKGhvc3QsICZp bmZvKTsKCglTYW0KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3Jn Cmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs 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.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 07E55C76186 for ; Wed, 24 Jul 2019 18:59:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D9F79206A2 for ; Wed, 24 Jul 2019 18:59:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728799AbfGXS7i (ORCPT ); Wed, 24 Jul 2019 14:59:38 -0400 Received: from asavdk4.altibox.net ([109.247.116.15]:48966 "EHLO asavdk4.altibox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725883AbfGXS7i (ORCPT ); Wed, 24 Jul 2019 14:59:38 -0400 Received: from ravnborg.org (unknown [158.248.194.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by asavdk4.altibox.net (Postfix) with ESMTPS id C6393804C5; Wed, 24 Jul 2019 20:59:34 +0200 (CEST) Date: Wed, 24 Jul 2019 20:59:33 +0200 From: Sam Ravnborg To: Navid Emamdoost Cc: emamd001@umn.edu, kjlu@umn.edu, smccaman@umn.edu, secalert@redhat.com, Thierry Reding , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] drm/panel: check failure cases in the probe func Message-ID: <20190724185933.GE22640@ravnborg.org> References: <20190724051700.GA22730@ravnborg.org> <20190724144845.4791-1-navid.emamdoost@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190724144845.4791-1-navid.emamdoost@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.3 cv=VcLZwmh9 c=1 sm=1 tr=0 a=UWs3HLbX/2nnQ3s7vZ42gw==:117 a=UWs3HLbX/2nnQ3s7vZ42gw==:17 a=jpOVt7BSZ2e4Z31A5e1TngXxSK0=:19 a=kj9zAlcOel0A:10 a=pGLkceISAAAA:8 a=ONRsVvzFGko7FBthncQA:9 a=CjuIK1q_8ugA:10 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Navid. Thanks for your patch. On Wed, Jul 24, 2019 at 09:48:44AM -0500, Navid Emamdoost wrote: > 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 > > Signed-off-by: Navid Emamdoost > --- > drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c > index 28c0620dfe0f..9484fdb60f68 100644 > --- a/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c > +++ b/drivers/gpu/drm/panel/panel-raspberrypi-touchscreen.c > @@ -399,7 +399,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) > + return -ENODEV; > + If we return here we will leak endpoint - a of_node_put() is missing. Use goto to rewind the allocations in the bottom of this function. > host = of_find_mipi_dsi_host_by_node(dsi_host_node); > of_node_put(dsi_host_node); > if (!host) { > @@ -408,6 +414,9 @@ static int rpi_touchscreen_probe(struct i2c_client *i2c, > } > > info.node = of_graph_get_remote_port(endpoint); > + if (!info.node) > + return -ENODEV; Here we also leak endpoint, but not dsi_host_node as we already did a put above. > + > of_node_put(endpoint); > > ts->dsi = mipi_dsi_device_register_full(host, &info); Sam