Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp10784513imu; Thu, 6 Dec 2018 06:47:06 -0800 (PST) X-Google-Smtp-Source: AFSGD/WrThBMqv0h2Clfg9TfZ45hAm3PnVM2a218dns4/uWuB6d2Hr3WqWgg38LhWRFUNSdwVjXA X-Received: by 2002:a63:ac1a:: with SMTP id v26mr24701026pge.293.1544107626224; Thu, 06 Dec 2018 06:47:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544107626; cv=none; d=google.com; s=arc-20160816; b=S59ccBZj7B7h5Xd8kCedG26wcxpZBPlZyIvxaYCL4TEc0f0EF5NDXEJNPMDwjc7V1i 0HCiQn0MygXQdm6rFrExu2mWWDHOYBqyoN+lNPSqJZc+3JYwT6vjpDyJ8YejTJljIf/x /C6uYtjkmvHyXwR4Rr+lyi6qZ61yDvF0Z+WAh3clrtSRTV+KDdxl3Br9xgssYgaSbjMr B5ER5iishwKUe71lgAS/n6pub2FhIfR2aWtGC69Dn8h7ivwZLjZznvi0KjlsBHuR3P0o Gn/V6ZkWDH6txGvTWSg4CLrf6elXO8V0Svv4k6rUhXbo1oCe3PPrBG39BsYIVya+ajF3 D0DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UqzHqhLp1OHaGPdoyXbqk+Or/Qk5xfOaKODOpzMLYPY=; b=zhCuktVBkedtbdn8O3yLzmxVF7D119/u5NlbmdvJEo7PqwVnQAt8KbougvprKdN1Jn XA8qASFBwgp9NFyJe81zAoSe3LMjyKNCux69h+1G5QCrhg0W6gAbiElmWGJ//IIAIxTf 9+nCb69UAkTj/L4SKVExJVKh1ZHZ5AM+WhGv2Do7YhuQkRfJVOAQ+otE/jF75Qhn+F6N xAooRaLnRUB041LrdRnJrJ0pIQHUQAe2zPBnZ/KB1uQMahbdzqUOXeGavvUgfn4InjEd p0JHvlLiSGqeOzNct6zUQmSzwK8gpi4KOe3o8q/kGYWidpB6RXao6uYRQ9MKyOlhzDPi edTw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=os9GSmWd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h14si428611pgd.189.2018.12.06.06.46.50; Thu, 06 Dec 2018 06:47:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=os9GSmWd; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730453AbeLFOpE (ORCPT + 99 others); Thu, 6 Dec 2018 09:45:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:49724 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730971AbeLFOpB (ORCPT ); Thu, 6 Dec 2018 09:45:01 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6ECBA2082B; Thu, 6 Dec 2018 14:44:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544107499; bh=xC6jaI3OwGf7Ya5tZYUwaTpGNezgkSnjHWG49AlHHx8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=os9GSmWdZsZByIjV9GNcJtUx956V4YbQFxvhgMk7i1AWhOe9nRBU3lYp/9amjqKWA AMAICpLe/jlhtsHxW0XfIjrcx68waV8+DaAhLxntVLs/V6rDtDWHcj7Y3nxs71aWs/ uftyJW8U2Okr4zuQjzwDN1vanJ7wcictNe2PazJs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christian Hoff , Sebastian Reichel , Dmitry Torokhov Subject: [PATCH 4.9 029/101] Input: matrix_keypad - check for errors from of_get_named_gpio() Date: Thu, 6 Dec 2018 15:38:28 +0100 Message-Id: <20181206143013.240876328@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181206143011.174892052@linuxfoundation.org> References: <20181206143011.174892052@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian Hoff commit d55bda1b3e7c5a87f10da54fdda866a9a9cef30b upstream. "of_get_named_gpio()" returns a negative error value if it fails and drivers should check for this. This missing check was now added to the matrix_keypad driver. In my case "of_get_named_gpio()" returned -EPROBE_DEFER because the referenced GPIOs belong to an I/O expander, which was not yet probed at the point in time when the matrix_keypad driver was loading. Because the driver did not check for errors from the "of_get_named_gpio()" routine, it was assuming that "-EPROBE_DEFER" is actually a GPIO number and continued as usual, which led to further errors like this later on: WARNING: CPU: 3 PID: 167 at drivers/gpio/gpiolib.c:114 gpio_to_desc+0xc8/0xd0 invalid GPIO -517 Note that the "GPIO number" -517 in the error message above is actually "-EPROBE_DEFER". As part of the patch a misleading error message "no platform data defined" was also removed. This does not lead to information loss because the other error paths in matrix_keypad_parse_dt() already print an error. Signed-off-by: Christian Hoff Suggested-by: Sebastian Reichel Reviewed-by: Sebastian Reichel Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/keyboard/matrix_keypad.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) --- a/drivers/input/keyboard/matrix_keypad.c +++ b/drivers/input/keyboard/matrix_keypad.c @@ -405,7 +405,7 @@ matrix_keypad_parse_dt(struct device *de struct matrix_keypad_platform_data *pdata; struct device_node *np = dev->of_node; unsigned int *gpios; - int i, nrow, ncol; + int ret, i, nrow, ncol; if (!np) { dev_err(dev, "device lacks DT data\n"); @@ -447,12 +447,19 @@ matrix_keypad_parse_dt(struct device *de return ERR_PTR(-ENOMEM); } - for (i = 0; i < pdata->num_row_gpios; i++) - gpios[i] = of_get_named_gpio(np, "row-gpios", i); + for (i = 0; i < nrow; i++) { + ret = of_get_named_gpio(np, "row-gpios", i); + if (ret < 0) + return ERR_PTR(ret); + gpios[i] = ret; + } - for (i = 0; i < pdata->num_col_gpios; i++) - gpios[pdata->num_row_gpios + i] = - of_get_named_gpio(np, "col-gpios", i); + for (i = 0; i < ncol; i++) { + ret = of_get_named_gpio(np, "col-gpios", i); + if (ret < 0) + return ERR_PTR(ret); + gpios[nrow + i] = ret; + } pdata->row_gpios = gpios; pdata->col_gpios = &gpios[pdata->num_row_gpios]; @@ -479,10 +486,8 @@ static int matrix_keypad_probe(struct pl pdata = dev_get_platdata(&pdev->dev); if (!pdata) { pdata = matrix_keypad_parse_dt(&pdev->dev); - if (IS_ERR(pdata)) { - dev_err(&pdev->dev, "no platform data defined\n"); + if (IS_ERR(pdata)) return PTR_ERR(pdata); - } } else if (!pdata->keymap_data) { dev_err(&pdev->dev, "no keymap data defined\n"); return -EINVAL;