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=-0.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=no 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 B2791C0044D for ; Wed, 11 Mar 2020 18:09:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FDF420735 for ; Wed, 11 Mar 2020 18:09:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583950186; bh=84idXkfq9afH+SLCq3/gwGj7XheWFxhNcrTBQayHQiQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=TTyXYho6O6YGpZg0RAQ1WbIt6gjWoV1HnlBOyfarcM2680/NGlNI0Gv1/5NV2RGx6 +T7TEzrC0ntIQwyb5SZ8IKwtmBmtGvKSm4psFPjiYrtvh3OlAKdsLs0uIKo6Nc14O4 FVYxa1BcPlT8uhC3iliv/J28YujftVVa3WkDP2Fw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730587AbgCKSJp (ORCPT ); Wed, 11 Mar 2020 14:09:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:56412 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730468AbgCKSJp (ORCPT ); Wed, 11 Mar 2020 14:09:45 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DF6E3206BE; Wed, 11 Mar 2020 18:09:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583950185; bh=84idXkfq9afH+SLCq3/gwGj7XheWFxhNcrTBQayHQiQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=R4ro9euCi/6eYEGt55wEAEp+ff20imnXhflL3Jlv536IplPQq0O7IwxB5VaTFvr6L XL8lwoc782tGsy2cegRhDnoc/ePRbDLVvvHHaMesq2cAriNDnZV6TwT+lyfO9tKuM5 buLnNN+0RIE5C2jXcJgFW7L9FZMqNJTm0yyt+65Q= Date: Wed, 11 Mar 2020 19:09:41 +0100 From: Greg Kroah-Hartman To: Holger =?iso-8859-1?Q?Hoffst=E4tte?= Cc: linux-kernel@vger.kernel.org, linux@roeck-us.net, shuah@kernel.org, stable@vger.kernel.org, Paolo Valente Subject: Re: [PATCH 5.4 000/168] 5.4.25-stable review Message-ID: <20200311180941.GA3970258@kroah.com> References: <20200310123635.322799692@linuxfoundation.org> <20200310143527.GB3376131@kroah.com> <20200310150018.GA3422873@kroah.com> <1371d06f-306b-7e42-3871-fb1a0d7936bf@applied-asynchrony.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1371d06f-306b-7e42-3871-fb1a0d7936bf@applied-asynchrony.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Tue, Mar 10, 2020 at 04:07:23PM +0100, Holger Hoffstätte wrote: > On 3/10/20 4:00 PM, Greg Kroah-Hartman wrote: > > On Tue, Mar 10, 2020 at 03:51:01PM +0100, Holger Hoffstätte wrote: > > > On 3/10/20 3:35 PM, Greg Kroah-Hartman wrote: > > > > On Tue, Mar 10, 2020 at 03:02:37PM +0100, Holger Hoffstätte wrote: > > > > > On 3/10/20 1:37 PM, Greg Kroah-Hartman wrote: > > > > > > This is the start of the stable review cycle for the 5.4.25 release. > > > > > > > > > > This fails to compile due to broken patch 001/168: > > > > > "block, bfq: get a ref to a group when adding it to a service tree": > > > > > > > > > > .. > > > > > block/bfq-wf2q.c: In function 'bfq_get_entity': > > > > > ./include/linux/kernel.h:994:51: error: 'struct bfq_group' has no member named 'entity' > > > > > .. > > > > > > > > > > The calls to bfq_get_entity::bfqg_and_blkg_get and bfq_forget_entity::bfqg_and_blkg_put > > > > > in bfq-wf2q.c need to be wrapped in #ifdef CONFIG_BFQ_GROUP_IOSCHED, otherwise > > > > > the build will fail when CONFIG_BFQ_GROUP_IOSCHED is not enabled. > > > > > This horribly error-prone #ifdef mess was finally removed in upstream commit > > > > > 4d8340d0d4d9. For 5.4 we'll either need that as well or add them back. > > > > > > > > Ick, that's a mess. > > > > > > > > I'll go drop that patch now, odd that it passed my build tests... > > > > > > Uh, please no? It fixes a rather nasty UAF when cgroups are in use. > > > Please just add the other upstream commit as well, I confirmed it applies > > > cleanly and fixes the problem. > > > > I didn't get that from your email at all, sorry. > > > > So, what commits, and in what order, should be applied to 5.4.y at the > > moment to resolve this issue? > > Just add upstream 4d8340d0d4d9 and it should work. Order shouldn't matter > (built for me either way) unless you want to follow upstream, in which case > it should come before "get a ref to a group..". Easy :) Ok, I've added both back now, and to the 5.5.y tree as well. Hopefully that should resolve these build issues. thanks, greg k-h