linux-kernel - [PATCH] input: ff-memless: don't schedule already playing effect to play again

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <1393760143-5986-1-git-send-email-felix.rueegg@gmail.com>
Date:	Sun,  2 Mar 2014 12:35:43 +0100
From:	Felix Rueegg <felix.rueegg@...il.com>
To:	Dmitry Torokhov <dmitry.torokhov@...il.com>
Cc:	linux-input@...r.kernel.org, linux-kernel@...r.kernel.org,
	Felix Rueegg <felix.rueegg@...il.com>
Subject: [PATCH] input: ff-memless: don't schedule already playing effect to play again

When an effect with zero replay length, zero replay delay
and zero envelope attack length is uploaded, it is played and then scheduled to play
again one timer tick later. This triggers a warning (URB submitted while
active) in combination with the xpad driver.

Skipping the rescheduling of this effect fixes the issue.

Signed-off-by: Felix Rueegg <felix.rueegg@...il.com>
---
 drivers/input/ff-memless.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
index 74c0d8c..2e06948 100644
--- a/drivers/input/ff-memless.c
+++ b/drivers/input/ff-memless.c
@@ -139,10 +139,13 @@ static void ml_schedule_timer(struct ml_device *ml)
 		if (!test_bit(FF_EFFECT_STARTED, &state->flags))
 			continue;
 
-		if (test_bit(FF_EFFECT_PLAYING, &state->flags))
+		if (test_bit(FF_EFFECT_PLAYING, &state->flags)) {
 			next_at = calculate_next_time(state);
-		else
+			if (next_at == now)
+				continue;
+		} else {
 			next_at = state->play_at;
+		}
 
 		if (time_before_eq(now, next_at) &&
 		    (++events == 1 || time_before(next_at, earliest)))
-- 
1.9.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/