Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jakub Sitnicki <jakub@cloudflare.com>,
	stable@vger.kernel.org, Sasha Levin <sashal@kernel.org>
Subject: Re: Patch "sk_msg: Always cancel strp work before freeing the psock" has been added to the 4.20-stable tree
Date: Tue, 12 Mar 2019 05:18:39 -0700	[thread overview]
Message-ID: <20190312121839.GA11968@kroah.com> (raw)
In-Reply-To: <37adecd1-76d3-3181-6999-9f0831558b5b@iogearbox.net>

On Tue, Mar 12, 2019 at 01:12:51PM +0100, Daniel Borkmann wrote:
> On 03/12/2019 01:05 PM, Greg KH wrote:
> > On Tue, Mar 12, 2019 at 10:41:26AM +0100, Jakub Sitnicki wrote:
> >> Hi,
> >>
> >> On Mon, Mar 11, 2019 at 08:17 PM CET, Sasha Levin wrote:
> >>> This is a note to let you know that I've just added the patch titled
> >>>
> >>>     sk_msg: Always cancel strp work before freeing the psock
> >>>
> >>> to the 4.20-stable tree which can be found at:
> >>>     http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
> >>>
> >>> The filename of the patch is:
> >>>      sk_msg-always-cancel-strp-work-before-freeing-the-ps.patch
> >>> and it can be found in the queue-4.20 subdirectory.
> >>>
> >>> If you, or anyone else, feels it should not be added to the stable tree,
> >>> please let <stable@vger.kernel.org> know about it.
> >>
> >> There is a follow-up fix for this change - e8e3437762ad ("bpf: Stop the
> >> psock parser before canceling its work") in bpf tree:
> >>
> >>   https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/commit/?id=e8e3437762ad938880dd48a3c52d702e7cf3c124
> >>
> >> I think this patch should not go to into stable without the follow-up
> >> fix. Otherwise kselftests for bpf will be noisy due to kernel warnings.
> > 
> > Thanks, I've dropped this now.  We can add this back when the original
> > patch hits Linus's tree.
> 
> This is already in Linus tree here, so we should be able to proceed with
> queueing both of them:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e8e3437762ad938880dd48a3c52d702e7cf3c124

Ah, thanks, didn't catch that, no morning coffee yet :)

I'll go queue up this patch for 5.0 now, and for 4.20 along with the
original one.

thanks again,

greg k-h

  reply	other threads:[~2019-03-12 12:18 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20190311191742.5406D2087F@mail.kernel.org>
2019-03-12  9:41 ` Patch "sk_msg: Always cancel strp work before freeing the psock" has been added to the 4.20-stable tree Jakub Sitnicki
2019-03-12 12:05   ` Greg KH
2019-03-12 12:12     ` Daniel Borkmann
2019-03-12 12:18       ` Greg KH [this message]
2019-03-12 12:20         ` Daniel Borkmann

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=20190312121839.GA11968@kroah.com \
    --to=greg@kroah.com \
    --cc=daniel@iogearbox.net \
    --cc=jakub@cloudflare.com \
    --cc=sashal@kernel.org \
    --cc=stable@vger.kernel.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