From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227Wvfhtg4BsEHKCpE0mqSoWvhWnLTN+8j+4/DQVsxOctuZzJmAfKEyo3nJ2SwiOulezVUvc ARC-Seal: i=1; a=rsa-sha256; t=1516611290; cv=none; d=google.com; s=arc-20160816; b=uDSTTvHOx8Pxg2QksYJBZ3Qo2zQGZxHWpp+05Qws+7DqzzUJu1QvQmCH2UMlrjIwwn D/74XYfS8N4s1Nloo1yLyv2tqrx+yStiDk9HhaiUNI5FkTqbGGfHRc5LTwrk3rrrFwFk I5U3Gp64yjN3T5V5ou6L51sw7ez5bjtV1oIAIMwHLM/g2GThPoVQJ0j85ym0WgLAJOAA tqCVkHIsmgx6TIMuCWuu2nPDKlDNfHD+B8j9xxG+EMAW0PfbiZ1Yz96DN26ucUGvvdoU S5Gg1KMOpEJgVNyF3zUg1TEF8ozZ/pv/rNArQMeLt4IRt378Kkp042DwfjEIZfAtAHCG v6RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=T2YsYRPv66msFeniE/JNyfUY4fJg5eXMkQZWWkc/q0w=; b=W7DNTGZKuvfL7rdDOic2X1+ULEwLJ8cihR2YEZ1FDGYHousTTVxWCMHr4c809nWdC3 JtXBA9d6pxC171YiynSD7e/Aoryu8rXjHTSuae+SswKgXWvC8mmw20Wl43QfU4li0mw5 2gwIavNUM19KpyJCKMoXZeAb6aGno6+uxqxyOZA4IXpYc1Z2T+QIn+6Ii74kaH6ozyMV Bj6qb9drEKtKR4YCeI3ci50jhkFgyvNRykofjq9nPYm5CDO0aMr22GoMW655ZQq1rqaT cHi47ecP/kWsU8POWtjl0J8j0accBnU56mnD21OSbi1OVb/b4ftyRaqduPdbPntYWrl/ LTkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold , Dmitry Torokhov Subject: [PATCH 4.9 25/47] Input: 88pm860x-ts - fix child-node lookup Date: Mon, 22 Jan 2018 09:45:36 +0100 Message-Id: <20180122083927.504055704@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083925.568134913@linuxfoundation.org> References: <20180122083925.568134913@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590281461471947051?= X-GMAIL-MSGID: =?utf-8?q?1590282200179260750?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold commit 906bf7daa0618d0ef39f4872ca42218c29a3631f upstream. Fix child node-lookup during probe, which ended up searching the whole device tree depth-first starting at parent rather than just matching on its children. To make things worse, the parent node was prematurely freed, while the child node was leaked. Fixes: 2e57d56747e6 ("mfd: 88pm860x: Device tree support") Signed-off-by: Johan Hovold Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/touchscreen/88pm860x-ts.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) --- a/drivers/input/touchscreen/88pm860x-ts.c +++ b/drivers/input/touchscreen/88pm860x-ts.c @@ -126,7 +126,7 @@ static int pm860x_touch_dt_init(struct p int data, n, ret; if (!np) return -ENODEV; - np = of_find_node_by_name(np, "touch"); + np = of_get_child_by_name(np, "touch"); if (!np) { dev_err(&pdev->dev, "Can't find touch node\n"); return -EINVAL; @@ -144,13 +144,13 @@ static int pm860x_touch_dt_init(struct p if (data) { ret = pm860x_reg_write(i2c, PM8607_GPADC_MISC1, data); if (ret < 0) - return -EINVAL; + goto err_put_node; } /* set tsi prebias time */ if (!of_property_read_u32(np, "marvell,88pm860x-tsi-prebias", &data)) { ret = pm860x_reg_write(i2c, PM8607_TSI_PREBIAS, data); if (ret < 0) - return -EINVAL; + goto err_put_node; } /* set prebias & prechg time of pen detect */ data = 0; @@ -161,10 +161,18 @@ static int pm860x_touch_dt_init(struct p if (data) { ret = pm860x_reg_write(i2c, PM8607_PD_PREBIAS, data); if (ret < 0) - return -EINVAL; + goto err_put_node; } of_property_read_u32(np, "marvell,88pm860x-resistor-X", res_x); + + of_node_put(np); + return 0; + +err_put_node: + of_node_put(np); + + return -EINVAL; } #else #define pm860x_touch_dt_init(x, y, z) (-1)