From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x226AqvTdSm/0elC1RLtiF8IruoiF1aHUSpO6lvtJ5fKA1UEyIsJTuXrcq1IOXkoA5tjifBcg ARC-Seal: i=1; a=rsa-sha256; t=1516611227; cv=none; d=google.com; s=arc-20160816; b=GCxhmitPXlOZQL1qCzSiqIVX1noF8klOyguU9oeL+qHd5XUI29uqSgb8HI7A6a1ZkF e0G69qe7DdMfyeuW9ZyI36JRdoeXWEQevhYS2kbAduvphkqk1xtvlsFpijG0qizIfjHF 2ewKSJLfXpFAtNTfhtAqvZrnlh33GAsLrPPmyxAx5IrH87roEUvI5lrtZKitkLaN8fT4 ToMY7fDUQpWDVcd2a7Ed4VS7+030dk8lsudrxhQaySvWND+sfn4OqG6XnNrDLShVsZkv jiEGkdKu3W8jIuwwueez3zODcCRgo/clF7+058tpW57J/gILJe0RXJfxud+UPz7O3tIX qIUg== 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=7DTjaXXQBOa7wHOWZHcSpop9ijdnPdIRRuPzclNAidU=; b=Px9FcCwDKsEAIGnRfV0aA0vsm7CTmwl6yqxWWlwbp5hTEIKTT6i+ed1ATfWSOtD9J0 QgxMTK9/j7nXRF9aTkvMs5a+VFbmkvQWY45/DxQCsuUfl7yt2pO8ojJRiNF9jO/XOIwJ cyfRE39rrNZrc22kEfjPZhzifU9TCsW4nzUM4mAkiDluf74GSrdOe5tdDmTEDWDMpaNz W666SF421VdOpPYisfRkWYVbSjxFFDvYODTATzpP6alhcnE72eD25dPQ2Ad8YF8oRlcj 2Dp3UqgUZ0U24lpfqK84GsyqgVwtrn1LE5ld2WkIVg7S+JF4QTqqw6CR/FjD0y4SKiH2 BU6w== 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.14 52/89] Input: 88pm860x-ts - fix child-node lookup Date: Mon, 22 Jan 2018 09:45:32 +0100 Message-Id: <20180122083959.923816592@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083954.683903493@linuxfoundation.org> References: <20180122083954.683903493@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?1590282134531543043?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-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)