linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Andrzej Pietrasiewicz <andrzej.p@collabora.com>,
	linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-samsung-soc@vger.kernel.org, linux-input@vger.kernel.org,
	linux-tegra@vger.kernel.org, patches@opensource.cirrus.com,
	ibm-acpi-devel@lists.sourceforge.net,
	platform-driver-x86@vger.kernel.org,
	"Rafael J . Wysocki" <rjw@rjwysocki.net>,
	Len Brown <lenb@kernel.org>, Jonathan Cameron <jic23@kernel.org>,
	Hartmut Knaack <knaack.h@gmx.de>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
	Kukjin Kim <kgene@kernel.org>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	Shawn Guo <shawnguo@kernel.org>,
	Sascha Hauer <s.hauer@pengutronix.de>,
	Pengutronix Kernel Team <kernel@pengutronix.de>,
	Fabio Estevam <festevam@gmail.com>,
	NXP Linux Team <linux-imx@nxp.com>,
	Vladimir Zapolskiy <vz@mleia.com>,
	Sylvain Lemieux <slemieux.tyco@gmail.com>,
	Laxman Dewangan <ldewangan@nvidia.com>,
	Thierry Reding <thierry.reding@gmail.com>,
	Jonathan Hunter <jonathanh@nvidia.com>,
	Barry Song <baohua@kernel.org>,
	Michael Hennerich <michael.hennerich@analog.com>,
	Nick Dyer <nick@shmanahar.org>,
	Hans de Goede <hdegoede@redhat.com>,
	Ferruh Yigit <fery@cypress.com>, Sangwon Jee <jeesw@melfas.com>,
	Peter Hutterer <peter.hutterer@redhat.com>,
	Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>,
	kernel@collabora.com,
	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Subject: [PATCH] Input: cyapa - do not call input_device_enabled from power mode handler
Date: Thu, 10 Dec 2020 23:09:38 -0800	[thread overview]
Message-ID: <X9MbMja+TEfbKkmJ@google.com> (raw)
In-Reply-To: <X9BwtHs9XriwR8gL@google.com>

Input device's user counter is supposed to be accessed only while holding
input->mutex.  Commit d69f0a43c677 ("Input: use input_device_enabled()")
recently switched cyapa to using the dedicated API and it uncovered the
fact that cyapa driver violated this constraint.

This patch removes checks whether the input device is open when clearing
device queues when changing device's power mode as there is no harm in
sending input events through closed input device - the events will simply
be dropped by the input core.

Note that there are more places in cyapa driver that call
input_device_enabled() without holding input->mutex, those are left
unfixed for now.

Reported-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---

Marek, could you please try this one?

 drivers/input/mouse/cyapa_gen3.c |    5 +----
 drivers/input/mouse/cyapa_gen5.c |    3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/input/mouse/cyapa_gen3.c b/drivers/input/mouse/cyapa_gen3.c
index a97f4acb6452..4a9022faf945 100644
--- a/drivers/input/mouse/cyapa_gen3.c
+++ b/drivers/input/mouse/cyapa_gen3.c
@@ -907,7 +907,6 @@ static u16 cyapa_get_wait_time_for_pwr_cmd(u8 pwr_mode)
 static int cyapa_gen3_set_power_mode(struct cyapa *cyapa, u8 power_mode,
 		u16 always_unused, enum cyapa_pm_stage pm_stage)
 {
-	struct input_dev *input = cyapa->input;
 	u8 power;
 	int tries;
 	int sleep_time;
@@ -953,7 +952,6 @@ static int cyapa_gen3_set_power_mode(struct cyapa *cyapa, u8 power_mode,
 	 * depending on the command's content.
 	 */
 	if (cyapa->operational &&
-	    input && input_device_enabled(input) &&
 	    (pm_stage == CYAPA_PM_RUNTIME_SUSPEND ||
 	     pm_stage == CYAPA_PM_RUNTIME_RESUME)) {
 		/* Try to polling in 120Hz, read may fail, just ignore it. */
@@ -1223,8 +1221,7 @@ static int cyapa_gen3_try_poll_handler(struct cyapa *cyapa)
 	    (data.finger_btn & OP_DATA_VALID) != OP_DATA_VALID)
 		return -EINVAL;
 
-	return cyapa_gen3_event_process(cyapa, &data);
-
+	return cyapa->input ? cyapa_gen3_event_process(cyapa, &data) : 0;
 }
 
 static int cyapa_gen3_initialize(struct cyapa *cyapa) { return 0; }
diff --git a/drivers/input/mouse/cyapa_gen5.c b/drivers/input/mouse/cyapa_gen5.c
index abf42f77b4c5..afc5aa4dcf47 100644
--- a/drivers/input/mouse/cyapa_gen5.c
+++ b/drivers/input/mouse/cyapa_gen5.c
@@ -518,8 +518,7 @@ int cyapa_empty_pip_output_data(struct cyapa *cyapa,
 			*len = length;
 			/* Response found, success. */
 			return 0;
-		} else if (cyapa->operational &&
-			   input && input_device_enabled(input) &&
+		} else if (cyapa->operational && input &&
 			   (pm_stage == CYAPA_PM_RUNTIME_RESUME ||
 			    pm_stage == CYAPA_PM_RUNTIME_SUSPEND)) {
 			/* Parse the data and report it if it's valid. */

  reply	other threads:[~2020-12-11  7:11 UTC|newest]

Thread overview: 101+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-30 16:16 [PATCH 0/2] Support inhibiting input devices Andrzej Pietrasiewicz
2020-04-30 16:16 ` [PATCH 1/2] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-05-06  0:27   ` Dmitry Torokhov
2020-05-15 16:49     ` [PATCHv2 0/7] Support inhibiting input devices Andrzej Pietrasiewicz
2020-05-15 16:51       ` [PATCHv2 1/7] Input: add input_device_enabled() Andrzej Pietrasiewicz
2020-05-15 16:51       ` [PATCHv2 2/7] Input: use input_device_enabled() Andrzej Pietrasiewicz
2020-05-15 16:52       ` [PATCHv2 4/7] iio: adc: exynos: Use input_device_enabled() Andrzej Pietrasiewicz
2020-05-15 16:52       ` [PATCHv2 5/7] platform/x86: thinkpad_acpi: " Andrzej Pietrasiewicz
2020-05-15 17:02         ` Henrique de Moraes Holschuh
2020-05-15 16:52       ` [PATCHv2 6/7] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-05-15 16:52       ` [PATCHv2 7/7] Input: elan_i2c: Support inhibiting Andrzej Pietrasiewicz
2020-05-15 16:53       ` [PATCHv2 3/7] ACPI: button: Use input_device_enabled() helper Andrzej Pietrasiewicz
2020-05-18 12:40         ` Rafael J. Wysocki
2020-05-15 18:19       ` [PATCHv2 0/7] Support inhibiting input devices Hans de Goede
2020-05-17 22:55         ` Peter Hutterer
2020-05-18  2:40           ` Dmitry Torokhov
2020-05-18  7:36             ` Hans de Goede
2020-05-22 15:35             ` Andrzej Pietrasiewicz
2020-05-27  6:13               ` Peter Hutterer
2020-05-18 10:48         ` Andrzej Pietrasiewicz
2020-05-18 12:24           ` Hans de Goede
2020-05-18 13:49             ` Andrzej Pietrasiewicz
2020-05-18 14:23               ` Hans de Goede
2020-05-19  9:02                 ` Andrzej Pietrasiewicz
2020-05-19  9:36                   ` Hans de Goede
2020-05-27  6:34                     ` Dmitry Torokhov
2020-06-02 16:56                       ` Andrzej Pietrasiewicz
2020-06-02 17:52                         ` Dmitry Torokhov
2020-06-02 18:50                           ` Andrzej Pietrasiewicz
2020-06-02 20:19                             ` Hans de Goede
2020-06-03 13:07                               ` Andrzej Pietrasiewicz
2020-06-03 17:38                                 ` Hans de Goede
2020-06-03 17:54                                   ` Andrzej Pietrasiewicz
2020-06-03 19:37                                     ` Hans de Goede
2020-06-04  7:28                                       ` Dmitry Torokhov
2020-06-05 17:33                                         ` [PATCH v3 " Andrzej Pietrasiewicz
2020-06-05 17:33                                           ` [PATCH v3 1/7] Input: add input_device_enabled() Andrzej Pietrasiewicz
2020-06-05 17:33                                           ` [PATCH v3 2/7] Input: use input_device_enabled() Andrzej Pietrasiewicz
2020-06-05 17:33                                           ` [PATCH v3 3/7] ACPI: button: Access input device's users under appropriate mutex Andrzej Pietrasiewicz
2020-06-05 17:33                                           ` [PATCH v3 4/7] ACPI: button: Use input_device_enabled() helper Andrzej Pietrasiewicz
2020-06-05 17:33                                           ` [PATCH v3 5/7] iio: adc: exynos: Use input_device_enabled() Andrzej Pietrasiewicz
2020-06-05 19:49                                             ` Michał Mirosław
2020-06-05 17:33                                           ` [PATCH v3 6/7] platform/x86: thinkpad_acpi: " Andrzej Pietrasiewicz
2020-06-05 17:33                                           ` [PATCH v3 7/7] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-06-05 17:41                                             ` Hans de Goede
2020-06-08 11:22                                               ` [PATCH v4 0/7] Support inhibiting input devices Andrzej Pietrasiewicz
2020-06-08 11:22                                                 ` [PATCH v4 1/7] Input: add input_device_enabled() Andrzej Pietrasiewicz
2020-12-03  6:25                                                   ` Dmitry Torokhov
2020-06-08 11:22                                                 ` [PATCH v4 2/7] Input: use input_device_enabled() Andrzej Pietrasiewicz
2020-12-03  6:26                                                   ` Dmitry Torokhov
     [not found]                                                   ` <CGME20201207133237eucas1p26f8484944760a14e51dc7353ed33cd28@eucas1p2.samsung.com>
2020-12-07 13:32                                                     ` Marek Szyprowski
2020-12-07 15:50                                                       ` Andrzej Pietrasiewicz
2020-12-08 10:05                                                         ` Marek Szyprowski
2020-12-09  6:37                                                           ` Dmitry Torokhov
2020-12-11  7:09                                                             ` Dmitry Torokhov [this message]
2020-12-11  8:22                                                               ` [PATCH] Input: cyapa - do not call input_device_enabled from power mode handler Marek Szyprowski
2020-12-11  8:31                                                                 ` Dmitry Torokhov
2020-06-08 11:22                                                 ` [PATCH v4 3/7] ACPI: button: Access input device's users under appropriate mutex Andrzej Pietrasiewicz
2020-06-24 15:00                                                   ` Rafael J. Wysocki
2020-06-25  5:23                                                     ` Dmitry Torokhov
2020-06-25 10:55                                                       ` Rafael J. Wysocki
2020-10-05  5:08                                                         ` Dmitry Torokhov
2020-06-08 11:22                                                 ` [PATCH v4 4/7] ACPI: button: Use input_device_enabled() helper Andrzej Pietrasiewicz
2020-06-25  5:24                                                   ` Dmitry Torokhov
2020-10-05  5:06                                                     ` Dmitry Torokhov
2020-06-08 11:22                                                 ` [PATCH v4 5/7] iio: adc: exynos: Use input_device_enabled() Andrzej Pietrasiewicz
2020-06-10  1:28                                                   ` Michał Mirosław
2020-06-10  7:52                                                     ` [FIXED PATCH " Andrzej Pietrasiewicz
2020-06-08 11:22                                                 ` [PATCH v4 6/7] platform/x86: thinkpad_acpi: " Andrzej Pietrasiewicz
2020-06-08 11:22                                                 ` [PATCH v4 7/7] Input: Add "inhibited" property Andrzej Pietrasiewicz
2020-10-05 18:10                                                   ` Dmitry Torokhov
2020-10-06 13:04                                                     ` Andrzej Pietrasiewicz
2020-10-07  1:11                                                       ` Dmitry Torokhov
2020-10-07  1:12                                                         ` Dmitry Torokhov
2020-12-03  6:26                                                           ` Dmitry Torokhov
2020-06-10  9:49                                                 ` [PATCH v4 0/7] Support inhibiting input devices Hans de Goede
2020-06-10 10:38                                                   ` Rafael J. Wysocki
2020-06-10 13:12                                                     ` Andrzej Pietrasiewicz
2020-06-10 13:21                                                       ` Hans de Goede
2020-06-10 13:41                                                         ` Andrzej Pietrasiewicz
2020-06-12  8:30                                                           ` Hans de Goede
2020-06-12  8:47                                                             ` Andrzej Pietrasiewicz
2020-06-16 17:29                                                             ` [PATCH] Input: document inhibiting Andrzej Pietrasiewicz
2020-06-16 17:38                                                               ` Randy Dunlap
2020-06-17  7:44                                                               ` Hans de Goede
2020-06-17 10:18                                                                 ` [PATCH v2] " Andrzej Pietrasiewicz
2020-06-17 10:21                                                                   ` Hans de Goede
2020-06-17 16:52                                                                   ` Randy Dunlap
2020-06-23 13:35                                                                   ` Pavel Machek
2020-12-03  6:27                                                                   ` Dmitry Torokhov
2020-06-10 14:01                                                         ` [PATCH v4 0/7] Support inhibiting input devices Rafael J. Wysocki
2020-06-10 13:52                                                     ` Hans de Goede
2020-06-10 18:28                                                     ` Dmitry Torokhov
2020-06-12  8:14                                                       ` Hans de Goede
2020-06-12  8:17                                                 ` Hans de Goede
2020-08-03 14:40                                                   ` Andrzej Pietrasiewicz
2020-06-07 20:24                                           ` [PATCH v3 " Pavel Machek
2020-06-08  5:37                                             ` Dmitry Torokhov
2020-06-08  9:28                                               ` Andrzej Pietrasiewicz
2020-04-30 16:16 ` [PATCH 2/2] Input: elan_i2c: Support inhibiting Andrzej Pietrasiewicz
2020-12-03  6:29   ` Dmitry Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=X9MbMja+TEfbKkmJ@google.com \
    --to=dmitry.torokhov@gmail.com \
    --cc=andrzej.p@collabora.com \
    --cc=b.zolnierkie@samsung.com \
    --cc=baohua@kernel.org \
    --cc=fery@cypress.com \
    --cc=festevam@gmail.com \
    --cc=hdegoede@redhat.com \
    --cc=ibm-acpi-devel@lists.sourceforge.net \
    --cc=ibm-acpi@hmh.eng.br \
    --cc=jeesw@melfas.com \
    --cc=jic23@kernel.org \
    --cc=jonathanh@nvidia.com \
    --cc=kernel@collabora.com \
    --cc=kernel@pengutronix.de \
    --cc=kgene@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=krzk@kernel.org \
    --cc=lars@metafoo.de \
    --cc=ldewangan@nvidia.com \
    --cc=lenb@kernel.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=michael.hennerich@analog.com \
    --cc=nick@shmanahar.org \
    --cc=patches@opensource.cirrus.com \
    --cc=peter.hutterer@redhat.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    --cc=rjw@rjwysocki.net \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    --cc=slemieux.tyco@gmail.com \
    --cc=thierry.reding@gmail.com \
    --cc=vz@mleia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).