From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224Ta4e+WiWKrdb6mDg+ve9wfJF2G4GIeQeNwSQNJYApywsQONEpuTMziOJQ/a57m9aaEYnM ARC-Seal: i=1; a=rsa-sha256; t=1517256628; cv=none; d=google.com; s=arc-20160816; b=J7wJ25moLjI7naGNBzFOACH3opCTnzH5OqRUgi/J/md+fBG/2iFhBW1GGjJmS/MVX2 JmuN0wuaJ/qINixktsA2H1jkAHfClKvGUQPP9DR+yQ1iALHP2WiOqTMVYqfOFYMsCP4d htctemMNsxbiuIKNgmAU07Prw95Gez1p1KkBSItyQKOZ9D1GfR3DBHkCVOvwCcEKxPEB VBl156y0QrJqvE+5b5WjuBWREXrCtASn36GZ5BonRBCmjryRL7f7TDHjBK+qbU+9uU3l MCAq1oLunuZtqRUJ+5aQoft8sMRCSK8ivkd2nfSDUl5qGTDF6WWMsLuJ611GMiBJG9vF iEiA== 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=gRnjsGasr5c8Ei5xzoVapmCdznyn2EUYamIWY8gQwKE=; b=Y4tZds9+EkHL6BOCnXNhNPuTAN8fkBaqfNQ8lEcL7sFqzB7LLVjdKvBc3bPGnMoms+ O6iW4ml2WTEs9rw/xstJUq+dy4YkqG+gflqN7z2xU8XOiVHZUY51h5zHFjCnmCAUHlZR 2i2y/IPT3I713ZpWtRLiJ3jzTlBRI2O2CMLGGRAUx+RDdifHgPBUNNiVPJE9Lakg1fBx 3I42dWBsh6iFMo35G93Jg4c/GjUyIzs1f3GGqRH0JtOWkOk9hBo/eA26HvfEydgPghys +SwsjxLjZybHtsQNpoVYFedPBJzLQEbJsNB8bOKq8f+trnDUM+1t3xid2vXHBecNUd1N MUMQ== 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 3.18 09/52] Input: 88pm860x-ts - fix child-node lookup Date: Mon, 29 Jan 2018 13:56:27 +0100 Message-Id: <20180129123628.602662616@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123628.168904217@linuxfoundation.org> References: <20180129123628.168904217@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?1590958886342446013?= X-GMAIL-MSGID: =?utf-8?q?1590958886342446013?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-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)