linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xiaoming Ni <nixiaoming@huawei.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: <linux-kernel@vger.kernel.org>, <stable@vger.kernel.org>,
	<sashal@kernel.org>, <tglx@linutronix.de>, <lee.jones@linaro.org>,
	<wangle6@huawei.com>, <zhengyejian1@huawei.com>
Subject: Re: [PATCH] futex: fix dead code in attach_to_pi_owner()
Date: Thu, 25 Feb 2021 16:56:10 +0800	[thread overview]
Message-ID: <71a24b9b-2a65-57a1-55bb-95f7ec3287dd@huawei.com> (raw)
In-Reply-To: <YDdfASEcv7i/DxHF@kroah.com>

On 2021/2/25 16:25, Greg KH wrote:
> On Mon, Feb 22, 2021 at 08:53:52PM +0800, Xiaoming Ni wrote:
>> From: Thomas Gleixner <tglx@linutronix.de>
>>
>> The handle_exit_race() function is defined in commit c158b461306df82
>>   ("futex: Cure exit race"), which never returns -EBUSY. This results
>> in a small piece of dead code in the attach_to_pi_owner() function:
>>
>> 	int ret = handle_exit_race(uaddr, uval, p); /* Never return -EBUSY */
>> 	...
>> 	if (ret == -EBUSY)
>> 		*exiting = p; /* dead code */
>>
>> The return value -EBUSY is added to handle_exit_race() in upsteam
>> commit ac31c7ff8624409 ("futex: Provide distinct return value when
>> owner is exiting"). This commit was incorporated into v4.9.255, before
>> the function handle_exit_race() was introduced, whitout Modify
>> handle_exit_race().
>>
>> To fix dead code, extract the change of handle_exit_race() from
>> commit ac31c7ff8624409 ("futex: Provide distinct return value when owner
>>   is exiting"), re-incorporated.
mainline:
ac31c7ff8624 futex: Provide distinct return value when owner is exiting

>>
>> Fixes: c158b461306df82 ("futex: Cure exit race")

stable linux-4.9.y
9c3f39860367 futex: Cure exit race
c27f392040e2 futex: Provide distinct return value when owner is exiting

>> Cc: stable@vger.kernel.org # 4.9.258-rc1
>> Signed-off-by: Xiaoming Ni <nixiaoming@huawei.com>
>> ---
>>   kernel/futex.c | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> What is the git commit id of this patch in Linus's tree?
> 
> Also, what kernel tree(s) is this supposed to go to?
> 
> thanks,
> 
> greg k-h
> .
> 
Sorry, the commit id c158b461306df82 in the patch does not exist in the 
linux-stable repository.
The commit ID is from linux-stable-rc.

I corrected the commit id in a subsequent email, and added a branch 
label. 
https://lore.kernel.org/lkml/20210224100923.51315-1-nixiaoming@huawei.com/

Sorry, I forgot to use "--in-reply-to=" when I sent the update patch.

This issue occurs only in the linux-4.9.y branch v4.9.258

Thanks
xiaoming Ni





  reply	other threads:[~2021-02-25  8:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-22 12:53 [PATCH] futex: fix dead code in attach_to_pi_owner() Xiaoming Ni
2021-02-25  8:25 ` Greg KH
2021-02-25  8:56   ` Xiaoming Ni [this message]
2021-02-25  9:31     ` Lee Jones

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=71a24b9b-2a65-57a1-55bb-95f7ec3287dd@huawei.com \
    --to=nixiaoming@huawei.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=lee.jones@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=wangle6@huawei.com \
    --cc=zhengyejian1@huawei.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).