mbox series

[stable,5.15,0/2] Revert the patchset for fix CVE-2024-26865

Message ID 20240506030554.3168143-1-shaozhengchao@huawei.com (mailing list archive)
Headers show
Series Revert the patchset for fix CVE-2024-26865 | expand

Message

shaozhengchao May 6, 2024, 3:05 a.m. UTC
There's no "pernet" variable in the struct hashinfo. The "pernet" variable
is introduced from v6.1-rc1. Revert pre-patch and post-patch.

Zhengchao Shao (2):
  Revert "tcp: Fix NEW_SYN_RECV handling in inet_twsk_purge()"
  Revert "tcp: Clean up kernel listener's reqsk in inet_twsk_purge()"

 net/ipv4/inet_timewait_sock.c | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

Comments

Greg KH May 23, 2024, 11:34 a.m. UTC | #1
On Mon, May 06, 2024 at 11:05:52AM +0800, Zhengchao Shao wrote:
> There's no "pernet" variable in the struct hashinfo. The "pernet" variable
> is introduced from v6.1-rc1. Revert pre-patch and post-patch.

I do not understand, why are these reverts needed?

How does the code currently build if there is no variable here?

confused,

greg k-h
Greg KH May 23, 2024, 11:39 a.m. UTC | #2
On Mon, May 06, 2024 at 11:05:52AM +0800, Zhengchao Shao wrote:
> There's no "pernet" variable in the struct hashinfo. The "pernet" variable
> is introduced from v6.1-rc1. Revert pre-patch and post-patch.

But right now, there is no "pernet" variable in the tree.

I'm confused, what are you trying to do here by reverting these two
commits?  Why are reverts required?

greg k-h
shaozhengchao May 25, 2024, 9:33 a.m. UTC | #3
On 2024/5/23 19:34, Greg KH wrote:
> On Mon, May 06, 2024 at 11:05:52AM +0800, Zhengchao Shao wrote:
>> There's no "pernet" variable in the struct hashinfo. The "pernet" variable
>> is introduced from v6.1-rc1. Revert pre-patch and post-patch.
> 
> I do not understand, why are these reverts needed?
> 
> How does the code currently build if there is no variable here?
> 
> confused,
> 
> greg k-h
Hi greg:
   If only the first patch is merged, compilation will fail.
There's no "pernet" variable in the struct hashinfo.

Thank you

Zhengchao Shao
Greg KH May 25, 2024, 9:42 a.m. UTC | #4
On Sat, May 25, 2024 at 05:33:00PM +0800, shaozhengchao wrote:
> 
> 
> On 2024/5/23 19:34, Greg KH wrote:
> > On Mon, May 06, 2024 at 11:05:52AM +0800, Zhengchao Shao wrote:
> > > There's no "pernet" variable in the struct hashinfo. The "pernet" variable
> > > is introduced from v6.1-rc1. Revert pre-patch and post-patch.
> > 
> > I do not understand, why are these reverts needed?
> > 
> > How does the code currently build if there is no variable here?
> > 
> > confused,
> > 
> > greg k-h
> Hi greg:
>   If only the first patch is merged, compilation will fail.
> There's no "pernet" variable in the struct hashinfo.

But both patches are merged together here.  Does the released kernel
versions fail to build somehow?

thanks,

greg k-h
shaozhengchao May 25, 2024, 10:21 a.m. UTC | #5
On 2024/5/25 17:42, Greg KH wrote:
> On Sat, May 25, 2024 at 05:33:00PM +0800, shaozhengchao wrote:
>>
>>
>> On 2024/5/23 19:34, Greg KH wrote:
>>> On Mon, May 06, 2024 at 11:05:52AM +0800, Zhengchao Shao wrote:
>>>> There's no "pernet" variable in the struct hashinfo. The "pernet" variable
>>>> is introduced from v6.1-rc1. Revert pre-patch and post-patch.
>>>
>>> I do not understand, why are these reverts needed?
>>>
>>> How does the code currently build if there is no variable here?
>>>
>>> confused,
>>>
>>> greg k-h
>> Hi greg:
>>    If only the first patch is merged, compilation will fail.
>> There's no "pernet" variable in the struct hashinfo.
> 
> But both patches are merged together here.  Does the released kernel
> versions fail to build somehow?
> 
> thanks,
> 
> greg k-h
> 
Work well, as I know.

Thank you

Zhengchao Shao
Greg KH May 25, 2024, 10:42 a.m. UTC | #6
On Sat, May 25, 2024 at 06:21:08PM +0800, shaozhengchao wrote:
> 
> 
> On 2024/5/25 17:42, Greg KH wrote:
> > On Sat, May 25, 2024 at 05:33:00PM +0800, shaozhengchao wrote:
> > > 
> > > 
> > > On 2024/5/23 19:34, Greg KH wrote:
> > > > On Mon, May 06, 2024 at 11:05:52AM +0800, Zhengchao Shao wrote:
> > > > > There's no "pernet" variable in the struct hashinfo. The "pernet" variable
> > > > > is introduced from v6.1-rc1. Revert pre-patch and post-patch.
> > > > 
> > > > I do not understand, why are these reverts needed?
> > > > 
> > > > How does the code currently build if there is no variable here?
> > > > 
> > > > confused,
> > > > 
> > > > greg k-h
> > > Hi greg:
> > >    If only the first patch is merged, compilation will fail.
> > > There's no "pernet" variable in the struct hashinfo.
> > 
> > But both patches are merged together here.  Does the released kernel
> > versions fail to build somehow?
> > 
> > thanks,
> > 
> > greg k-h
> > 
> Work well, as I know.

Ok, then why send these reverts?  Are they needed, or are they not
needed?  And if needed, why?

still confused,

greg k-h
shaozhengchao May 29, 2024, 7:59 a.m. UTC | #7
On 2024/5/25 18:42, Greg KH wrote:
> On Sat, May 25, 2024 at 06:21:08PM +0800, shaozhengchao wrote:
>>
>>
>> On 2024/5/25 17:42, Greg KH wrote:
>>> On Sat, May 25, 2024 at 05:33:00PM +0800, shaozhengchao wrote:
>>>>
>>>>
>>>> On 2024/5/23 19:34, Greg KH wrote:
>>>>> On Mon, May 06, 2024 at 11:05:52AM +0800, Zhengchao Shao wrote:
>>>>>> There's no "pernet" variable in the struct hashinfo. The "pernet" variable
>>>>>> is introduced from v6.1-rc1. Revert pre-patch and post-patch.
>>>>>
>>>>> I do not understand, why are these reverts needed?
>>>>>
>>>>> How does the code currently build if there is no variable here?
>>>>>
>>>>> confused,
>>>>>
>>>>> greg k-h
>>>> Hi greg:
>>>>     If only the first patch is merged, compilation will fail.
>>>> There's no "pernet" variable in the struct hashinfo.
>>>
>>> But both patches are merged together here.  Does the released kernel
>>> versions fail to build somehow?
>>>
>>> thanks,
>>>
>>> greg k-h
>>>
>> Work well, as I know.
> 
> Ok, then why send these reverts?  Are they needed, or are they not
> needed?  And if needed, why?
> 
> still confused,
> 
> greg k-h
> 
Hi greg:
   If the patchset is merged together, and the compilation is normal. I'm
just concerned that some people only put in one of the patchset and 
forget to put in both of them, which will be a problem.

Thank you.

Zhengchao Shao
Greg KH May 29, 2024, 10:02 a.m. UTC | #8
On Wed, May 29, 2024 at 03:59:31PM +0800, shaozhengchao wrote:
> 
> 
> On 2024/5/25 18:42, Greg KH wrote:
> > On Sat, May 25, 2024 at 06:21:08PM +0800, shaozhengchao wrote:
> > > 
> > > 
> > > On 2024/5/25 17:42, Greg KH wrote:
> > > > On Sat, May 25, 2024 at 05:33:00PM +0800, shaozhengchao wrote:
> > > > > 
> > > > > 
> > > > > On 2024/5/23 19:34, Greg KH wrote:
> > > > > > On Mon, May 06, 2024 at 11:05:52AM +0800, Zhengchao Shao wrote:
> > > > > > > There's no "pernet" variable in the struct hashinfo. The "pernet" variable
> > > > > > > is introduced from v6.1-rc1. Revert pre-patch and post-patch.
> > > > > > 
> > > > > > I do not understand, why are these reverts needed?
> > > > > > 
> > > > > > How does the code currently build if there is no variable here?
> > > > > > 
> > > > > > confused,
> > > > > > 
> > > > > > greg k-h
> > > > > Hi greg:
> > > > >     If only the first patch is merged, compilation will fail.
> > > > > There's no "pernet" variable in the struct hashinfo.
> > > > 
> > > > But both patches are merged together here.  Does the released kernel
> > > > versions fail to build somehow?
> > > > 
> > > > thanks,
> > > > 
> > > > greg k-h
> > > > 
> > > Work well, as I know.
> > 
> > Ok, then why send these reverts?  Are they needed, or are they not
> > needed?  And if needed, why?
> > 
> > still confused,
> > 
> > greg k-h
> > 
> Hi greg:
>   If the patchset is merged together, and the compilation is normal. I'm
> just concerned that some people only put in one of the patchset and forget
> to put in both of them, which will be a problem.

That's not our responsibility at all.  There is a reason we do releases,
not just individual commits.  We test and release changes all at the
same time, and so, you should just take them all please.  Otherwise you
are on your own and usually end up with a broken system.

good luck!

greg k-h