Re: Patch "Input: ims-pcu - fix calling interruptible mutex" has been added to the 6.11-stable tree

Re: Patch "Input: ims-pcu - fix calling interruptible mutex" has been added to the 6.11-stable tree

[Dmitry Torokhov]

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

Re: Patch "Input: ims-pcu - fix calling interruptible mutex" has been added to the 6.11-stable tree

[Greg KH]

On Tue, Oct 01, 2024 at 02:07:21AM -0700, Dmitry Torokhov wrote:
> 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... 

It already is in the 6.11 kernel tree, so why would this fix, which
says:

> > 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")

This is a bugfix for the 6.11 tree, not be applicable to the 6.11.y
releases?

thanks,

greg k-h

Re: Patch "Input: ims-pcu - fix calling interruptible mutex" has been added to the 6.11-stable tree

[Dmitry Torokhov]

On Tue, Oct 01, 2024 at 11:33:12AM +0200, Greg KH wrote:
> On Tue, Oct 01, 2024 at 02:07:21AM -0700, Dmitry Torokhov wrote:
> > 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... 
> 
> It already is in the 6.11 kernel tree, so why would this fix, which
> says:
> 
> > > 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")
> 
> This is a bugfix for the 6.11 tree, not be applicable to the 6.11.y
> releases?

Oh, my bad, I did not realize 703f12672e1f made into 6.11. Sorry about
this.

-- 
Dmitry