From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0C00C43381 for ; Tue, 12 Mar 2019 12:18:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9CC3620883 for ; Tue, 12 Mar 2019 12:18:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=kroah.com header.i=@kroah.com header.b="KyiETmS3"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="8POAA9i5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725895AbfCLMSn (ORCPT ); Tue, 12 Mar 2019 08:18:43 -0400 Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:58631 "EHLO wout2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725894AbfCLMSm (ORCPT ); Tue, 12 Mar 2019 08:18:42 -0400 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id CFBD3329A; Tue, 12 Mar 2019 08:18:41 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Tue, 12 Mar 2019 08:18:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kroah.com; h= date:from:to:cc:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm3; bh=MdyGDw1RbC0an/hOjrt/gKA0Mp+ E6/MKWzRL8tDYtPw=; b=KyiETmS3KCUs043mLBLaF/wMGcA+BhyZj7lHS9ziBRD g4uZF5yl1FP8lduWDC8jRr6cQmV7+I17Z5VQQSiHSnPYDZig+VDrKQRzrgnJjA9b H7byEl6tml4vfQovKuby8yW35cOTFgXH1ybd8ekzENey82HeW0X+s+AsDXM5DC6J H+4Ozcu0X4wjguDJKhXyvqK3Fdy+pu+tgDvaeg/VFbBddCqamiDefzoWsvJOxtKF MjWq5i/W6sLIAZkjSvsSjW2upXTlyq+TsldN1ai7lJYt1KA2sG6EU4x1NAaoLCGa z84z+Wb0BdxTvGZCJTkADN+uuJHW0SRZg3d+varPxzA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=MdyGDw 1RbC0an/hOjrt/gKA0Mp+E6/MKWzRL8tDYtPw=; b=8POAA9i5cT0O88NlFzQR/P SsKLNPiGnQJSTVfs3/8IW1CG8osUW9VsSTqQfxGxzg/44Mps5/CvcA9kd/fgorQh V1SJKzGkbK9/jGqQAMEWDDMV/BnAt/umfXQwMJnTxoPNLKKFyhTpNH1A+CrNR/an q4hnoJRhh2vqeE03QJdIwWychjROUAs1JHF1xZhObz6h1bi5a5vYJUcWu/uOOo3f oJwdl4aJwQ86xePE5neSaSNCd0MjLK21iy5zPGZVoBAP42YLcNLs6UEdfBcLxEed 8LTi5Xq/M4xFWEjsrk0ISvnF7sX1XorocAf2rtAq4IYdajOyScHIWanADGLmY/Aw == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedutddrgeekgdeflecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpeffhffvuffkfhggtggujggfsehttdertddtredvnecuhfhrohhmpefirhgvghcu mffjuceoghhrvghgsehkrhhorghhrdgtohhmqeenucffohhmrghinhepkhgvrhhnvghlrd horhhgnecukfhppeduvddrvdejrdeihedrvddvudenucfrrghrrghmpehmrghilhhfrhho mhepghhrvghgsehkrhhorghhrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from localhost (unknown [12.27.65.221]) by mail.messagingengine.com (Postfix) with ESMTPA id 5DE78E4887; Tue, 12 Mar 2019 08:18:40 -0400 (EDT) Date: Tue, 12 Mar 2019 05:18:39 -0700 From: Greg KH To: Daniel Borkmann Cc: Jakub Sitnicki , stable@vger.kernel.org, Sasha Levin Subject: Re: Patch "sk_msg: Always cancel strp work before freeing the psock" has been added to the 4.20-stable tree Message-ID: <20190312121839.GA11968@kroah.com> References: <20190311191742.5406D2087F@mail.kernel.org> <87a7i08m61.fsf@cloudflare.com> <20190312120516.GA30474@kroah.com> <37adecd1-76d3-3181-6999-9f0831558b5b@iogearbox.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <37adecd1-76d3-3181-6999-9f0831558b5b@iogearbox.net> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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 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