From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5BE00272E6D; Mon, 13 Apr 2026 16:08:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776096519; cv=none; b=KX5qshc4szsYrylm2sZ6inoCfFgRLcUyQxItxVIiHiKy3wgA4nnqKC4Rm0+f7/lyDpjnzPXdAYi9gL2RxbIjbF0ECE5JJDrPLSj3ptDIT44547aHfVo068pK003XTzaRVOTrOwSM1VmUhZ8r5Nyu9985ZD6uTJSxaradZpiOtis= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776096519; c=relaxed/simple; bh=dF3W+QNhFGudqXzcxjIVHxXbahYMG+tHod90LkXbdOQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ANCg6S/V3wtKoVgyng0Awc+4uedoWEsEq5r7FjzpcvO91+NGkk+K3giZaleSHlyh7db5rbSNwGB0lbqFpwTAWqT7EuaECyCmVHy79Mu7n1hGjmPNERzVoP0J3fyD0xWfUpOoJcaBOAeKHoFKuK3MzAqFVnDJ6W4rCJAmrR00pA4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ty0A7+14; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ty0A7+14" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1FF9C2BCB0; Mon, 13 Apr 2026 16:08:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776096519; bh=dF3W+QNhFGudqXzcxjIVHxXbahYMG+tHod90LkXbdOQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ty0A7+14wlw52irizgwy5zwJApU9bw4leE801ur9UGtmXy9I9W1iPtWOvY2F8W1Uh 8NYg/qoI8Da5hyfAp8pSZwqEoHuf+PQgv2YpHG2027W4mTocuGNIqJL/aKIBf7Pvfm eqwC2EwTxouIl2gtJkAfWo3ujz2kd+Fi9FvBMQ2M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mikhail Gavrilov , Dmitry Torokhov Subject: [PATCH 6.18 10/83] Input: uinput - take event lock when submitting FF request "event" Date: Mon, 13 Apr 2026 17:59:38 +0200 Message-ID: <20260413155731.413256132@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260413155731.019638460@linuxfoundation.org> References: <20260413155731.019638460@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Torokhov commit ff14dafde15c11403fac61367a34fea08926e9ee upstream. To avoid racing with FF playback events and corrupting device's event queue take event_lock spinlock when calling uinput_dev_event() when submitting a FF upload or erase "event". Tested-by: Mikhail Gavrilov Link: https://patch.msgid.link/adXkf6MWzlB8LA_s@google.com Cc: stable@vger.kernel.org Signed-off-by: Dmitry Torokhov Signed-off-by: Greg Kroah-Hartman --- drivers/input/misc/uinput.c | 7 +++++++ 1 file changed, 7 insertions(+) --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -25,8 +25,10 @@ #include #include #include +#include #include #include +#include #include #include "../input-compat.h" @@ -76,6 +78,8 @@ static int uinput_dev_event(struct input struct uinput_device *udev = input_get_drvdata(dev); struct timespec64 ts; + lockdep_assert_held(&dev->event_lock); + ktime_get_ts64(&ts); udev->buff[udev->head] = (struct input_event) { @@ -147,6 +151,7 @@ static void uinput_request_release_slot( static int uinput_request_send(struct uinput_device *udev, struct uinput_request *request) { + unsigned long flags; int retval = 0; spin_lock(&udev->state_lock); @@ -160,7 +165,9 @@ static int uinput_request_send(struct ui * Tell our userspace application about this new request * by queueing an input event. */ + spin_lock_irqsave(&udev->dev->event_lock, flags); uinput_dev_event(udev->dev, EV_UINPUT, request->code, request->id); + spin_unlock_irqrestore(&udev->dev->event_lock, flags); out: spin_unlock(&udev->state_lock);