Re: FAILED: patch "[PATCH] maple_tree: fix mas_empty_area_rev() null pointer dereference" failed to apply to 6.1-stable tree

[Greg KH <gregkh@linuxfoundation.org>]

On Fri, May 24, 2024 at 09:03:15AM -0400, Liam R. Howlett wrote:
> * Greg KH <gregkh@linuxfoundation.org> [240524 00:10]:
> > On Thu, May 23, 2024 at 03:45:22PM -0400, Liam R. Howlett wrote:
> > > * gregkh@linuxfoundation.org <gregkh@linuxfoundation.org> [240513 09:30]:
> > > > 
> > > > The patch below does not apply to the 6.1-stable tree.
> > > > If someone wants it applied there, or to any other stable or longterm
> > > > tree, then please email the backport, including the original git commit
> > > > id to <stable@vger.kernel.org>.
> > > > 
> > > > To reproduce the conflict and resubmit, you may use the following commands:
> > > > 
> > > > git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y
> > > > git checkout FETCH_HEAD
> > > > git cherry-pick -x 955a923d2809803980ff574270f81510112be9cf
> > > > # <resolve conflicts, build, test, etc.>
> > > > git commit -s
> > > > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2024051347-uncross-jockstrap-5ce0@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
> > > > 
> > > > Possible dependencies:
> > > > 
> > > > 955a923d2809 ("maple_tree: fix mas_empty_area_rev() null pointer dereference")
> > > > 29ad6bb31348 ("maple_tree: fix allocation in mas_sparse_area()")
> > >    ^- This patch is needed, and has a fixes tag.  I'm not entirely sure
> > >    why it wasn't included in 6.1 already, but it applies cleanly and
> > >    fixes the issue with 955a923d2809.
> > 
> > "Fixes:" tags does not mean "will always end up in stable".  Please
> > read:
> >     https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
> > for how to do this properly.
> 
> Thank you.  The Cc of stable was missing but wasn't required at the
> time, so this patch was not taken and wasn't necessary.  It's better to
> take it now.
> 
> > 
> > > > fad8e4291da5 ("maple_tree: make maple state reusable after mas_empty_area_rev()")
> > 
> > So you want us to take all of these?  Or just the one?
> 
> Apologies for not being clear.
> 
> The last patch in the list (fad8e4291da5) is reported to be an empty
> cherry-pick and stable was Cc'ed on that fix.
> 
> Please apply:
> 29ad6bb31348 ("maple_tree: fix allocation in mas_sparse_area()")
> then
> 955a923d2809 ("maple_tree: fix mas_empty_area_rev() null pointer dereference")

Now done, thanks.

greg k-h