From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: stable@vger.kernel.org
Cc: stable-commits@vger.kernel.org, dlechner@baylibre.com
Subject: Re: Patch "Input: ims-pcu - fix calling interruptible mutex" has been added to the 6.11-stable tree
Date: Tue, 1 Oct 2024 02:07:21 -0700 [thread overview]
Message-ID: <Zvu7yZx5XW2nXmxU@google.com> (raw)
In-Reply-To: <20240930232429.2569091-1-sashal@kernel.org>
On Mon, Sep 30, 2024 at 07:24:28PM -0400, Sasha Levin wrote:
> This is a note to let you know that I've just added the patch titled
>
> Input: ims-pcu - fix calling interruptible mutex
>
> to the 6.11-stable tree which can be found at:
> http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
>
> The filename of the patch is:
> input-ims-pcu-fix-calling-interruptible-mutex.patch
> and it can be found in the queue-6.11 subdirectory.
>
> If you, or anyone else, feels it should not be added to the stable tree,
> please let <stable@vger.kernel.org> know about it.
>
Did you manage to pick up 703f12672e1f ("Input: ims-pcu - switch to
using cleanup functions") for stable? I would love to see the
justification for that...
>
>
> commit c137195362a652adfbc6a538b78a40b043de6eb0
> Author: David Lechner <dlechner@baylibre.com>
> Date: Tue Sep 10 16:58:47 2024 -0500
>
> Input: ims-pcu - fix calling interruptible mutex
>
> [ Upstream commit 82abef590eb31d373e632743262ee7c42f49c289 ]
>
> Fix calling scoped_cond_guard() with mutex instead of mutex_intr.
>
> scoped_cond_guard(mutex, ...) will call mutex_lock() instead of
> mutex_lock_interruptible().
>
> Fixes: 703f12672e1f ("Input: ims-pcu - switch to using cleanup functions")
> Signed-off-by: David Lechner <dlechner@baylibre.com>
> Link: https://lore.kernel.org/r/20240910-input-misc-ims-pcu-fix-mutex-intr-v1-1-bdd983685c43@baylibre.com
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
>
> diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
> index c086dadb45e3a..058f3470b7ae2 100644
> --- a/drivers/input/misc/ims-pcu.c
> +++ b/drivers/input/misc/ims-pcu.c
> @@ -1067,7 +1067,7 @@ static ssize_t ims_pcu_attribute_store(struct device *dev,
> if (data_len > attr->field_length)
> return -EINVAL;
>
> - scoped_cond_guard(mutex, return -EINTR, &pcu->cmd_mutex) {
> + scoped_cond_guard(mutex_intr, return -EINTR, &pcu->cmd_mutex) {
> memset(field, 0, attr->field_length);
> memcpy(field, buf, data_len);
>
--
Dmitry
next parent reply other threads:[~2024-10-01 9:07 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240930232429.2569091-1-sashal@kernel.org>
2024-10-01 9:07 ` Dmitry Torokhov [this message]
2024-10-01 9:33 ` Patch "Input: ims-pcu - fix calling interruptible mutex" has been added to the 6.11-stable tree Greg KH
2024-10-01 10:41 ` 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=Zvu7yZx5XW2nXmxU@google.com \
--to=dmitry.torokhov@gmail.com \
--cc=dlechner@baylibre.com \
--cc=stable-commits@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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).