On Wed, Feb 21, 2024 at 07:56:01AM +0530, Harshit Mogalapalli wrote:
> Hi Greg,
>
> On 21/02/24 01:58, gregkh@xxxxxxxxxxxxxxxxxxx wrote:
> > On Tue, Feb 06, 2024 at 01:16:01PM +0530, Harshit Mogalapalli wrote:
> > > Hi Salvatore,
> > >
> > > Adding kovalev here(who backported it to 5.10.y)
> > >
> > > On 03/02/24 9:09 pm, Salvatore Bonaccorso wrote:
> > > > Hi,
> > > >
> > > > On Thu, Feb 01, 2024 at 12:58:28PM +0000, Mohamed Abuelfotoh, Hazem wrote:
> > > > >
> > > > > On 31/01/2024 17:19, Paulo Alcantara wrote:
> > > > > > Greg, could you please drop
> > > > > >
> > > > > > b3632baa5045 ("cifs: fix off-by-one in SMB2_query_info_init()")
> > > > > >
> > > > > > from v5.10.y as suggested by Salvatore?
> > > > > >
> > > > > > Thanks.
> > > > >
> > > > > Are we dropping b3632baa5045 ("cifs: fix off-by-one in
> > > > > SMB2_query_info_init()") from v5.10.y while keeping it on v5.15.y? if we are
> > > > > dropping it from v5.15.y as well then we should backport 06aa6eff7b smb3:
> > > > > Replace smb2pdu 1-element arrays with flex-arrays to v5.15.y I remember
> > > > > trying to backport this patch on v5.15.y but there were some merge conflicts
> > > > > there.
> > > > >
> > > > > 06aa6eff7b smb3: Replace smb2pdu 1-element arrays with flex-arrays
> > > >
> > > > While I'm not eligible to say what should be done, my understading is
> > > > that Greg probably would prefer to have the "backport 06aa6eff7b"
> > > > version. What we know is that having now both commits in the
> > > > stable-rc/linux-5.10.y queue breaks cifs and the backport variants
> > > > seens to work fine (Paulo Alcantara probably though can comment best).
> > > >
> > > Having both one-liner fix that I have sent and the above commit isn't
> > > correct.
> > >
> > > > As 06aa6eff7b smb3: Replace smb2pdu 1-element arrays with flex-arrays
> > > > was backportable to 5.10.y it should now work as well for the upper
> > > > one 5.15.y.
> > >
> > > Correct, I agree. I had to send one-liner fix as we have the
> > > backport("06aa6eff7b smb3: Replace smb2pdu 1-element arrays with
> > > flex-arrays") missing in 5.15.y and when I tried backporting it to 5.15.y I
> > > saw many conflicts.
> > >
> > > If we have backport for 5.15.y similar to 5.10.y we could ask greg to remove
> > > one liner fix from both 5.10.y and 5.15.y: https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.10/cifs-fix-off-by-one-in-smb2_query_info_init.patch
> >
> > Someone needs to tell me what to do, as I'm lost.
> >
>
> For 5.15.y:
>
> 1. Remove this patch from the queue:
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.15/cifs-fix-off-by-one-in-smb2_query_info_init.patch
> 2. Add this patch(kovalev's backport) to queue:
> https://lore.kernel.org/lkml/20240206161111.454699-1-kovalev@xxxxxxxxxxxx/T/#u
Now done.
> For 5.10.y:
>
> 1. Remove this patch from the queue:
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.10/cifs-fix-off-by-one-in-smb2_query_info_init.patch
>
> (kovalev's backport is already in queue[1], so nothing to add here like '2'
> in 5.15.y)
Now done.
Ok, I think we are good. I'll push out -rc kernels soon for people to
test with.
thanks,
greg k-h
