From: Catalin Marinas <catalin.marinas@arm.com>
To: Helge Deller <deller@gmx.de>
Cc: gregkh@linuxfoundation.org, sam@gentoo.org,
stable@vger.kernel.org, torvalds@linux-foundation.org,
Florent Revest <revest@chromium.org>,
Kees Cook <keescook@chromium.org>
Subject: Re: FAILED: patch "[PATCH] prctl: Disable prctl(PR_SET_MDWE) on parisc" failed to apply to 6.5-stable tree
Date: Mon, 27 Nov 2023 11:59:46 +0000 [thread overview]
Message-ID: <ZWSEsrpogmi7LQa_@arm.com> (raw)
In-Reply-To: <1aadb9ed-5118-4a6f-a273-495466f4737b@gmx.de>
On Fri, Nov 24, 2023 at 04:10:25PM +0100, Helge Deller wrote:
> On 11/24/23 12:35, gregkh@linuxfoundation.org wrote:
> > The patch below does not apply to the 6.5-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.5.y
> > git checkout FETCH_HEAD
> > git cherry-pick -x 793838138c157d4c49f4fb744b170747e3dabf58
> > # <resolve conflicts, build, test, etc.>
> > git commit -s
> > git send-email --to '<stable@vger.kernel.org>' --in-reply-to '2023112456-linked-nape-bf19@gregkh' --subject-prefix 'PATCH 6.5.y' HEAD^..
> >
> > Possible dependencies:
> >
> > 793838138c15 ("prctl: Disable prctl(PR_SET_MDWE) on parisc")
> > 24e41bf8a6b4 ("mm: add a NO_INHERIT flag to the PR_SET_MDWE prctl")
> > 0da668333fb0 ("mm: make PR_MDWE_REFUSE_EXEC_GAIN an unsigned long")
>
> Greg, I think the most clean solution is that you pull in this patch:
>
> commit 24e41bf8a6b424c76c5902fb999e9eca61bdf83d
> Author: Florent Revest <revest@chromium.org>
> Date: Mon Aug 28 17:08:57 2023 +0200
> mm: add a NO_INHERIT flag to the PR_SET_MDWE prctl
>
> as well into 6.5-stable and 6.6-stable prior to applying my patch.
>
> Florent, Kees and Catalin, do you see any issues if this patch
> ("mm: add a NO_INHERIT flag to the PR_SET_MDWE prctl") is backported
> to 6.5 and 6.6 too?
> If yes, I'm happy to just send the trivial backport of my patch below...
TBH, given that the NO_INHERIT MDWE is a new feature and it took us a
few rounds to define its semantics, I'd rather not back-port it unless
someone has a strong need for it in 6.5 (not sure the stable rules even
allow for this). The parisc patch is simple enough to be backported on
its own.
--
Catalin
next prev parent reply other threads:[~2023-11-27 11:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-24 11:35 FAILED: patch "[PATCH] prctl: Disable prctl(PR_SET_MDWE) on parisc" failed to apply to 6.5-stable tree gregkh
2023-11-24 15:10 ` Helge Deller
2023-11-24 15:57 ` Greg KH
2023-11-24 19:06 ` Helge Deller
2023-11-27 11:59 ` Catalin Marinas [this message]
2023-11-27 13:40 ` Helge Deller
2023-11-27 16:08 ` Florent Revest
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=ZWSEsrpogmi7LQa_@arm.com \
--to=catalin.marinas@arm.com \
--cc=deller@gmx.de \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=revest@chromium.org \
--cc=sam@gentoo.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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