From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@kernel.org>
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
	aws-us-west-2-korg-lkml-1.web.codeaurora.org
Received: from vger.kernel.org (vger.kernel.org [23.128.96.18])
	by smtp.lore.kernel.org (Postfix) with ESMTP id C34E3C433FE
	for <stable@archiver.kernel.org>; Tue,  8 Nov 2022 17:10:27 +0000 (UTC)
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S233539AbiKHRK0 (ORCPT <rfc822;stable@archiver.kernel.org>);
        Tue, 8 Nov 2022 12:10:26 -0500
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47370 "EHLO
        lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S234085AbiKHRKZ (ORCPT
        <rfc822;stable@vger.kernel.org>); Tue, 8 Nov 2022 12:10:25 -0500
Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1])
        by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1897911A37
        for <stable@vger.kernel.org>; Tue,  8 Nov 2022 09:10:25 -0800 (PST)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
        (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
        (No client certificate requested)
        by dfw.source.kernel.org (Postfix) with ESMTPS id B40BB616D8
        for <stable@vger.kernel.org>; Tue,  8 Nov 2022 17:10:24 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id E32BEC433D6;
        Tue,  8 Nov 2022 17:10:22 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org;
        s=korg; t=1667927424;
        bh=LqBKK4mfRMflUJdqQ5LB48O45KoAjxVn/v5+pMB87do=;
        h=Date:From:To:Cc:Subject:References:In-Reply-To:From;
        b=jmhrOxeoYHnKWnOvydkSZ5vjcPxLDgCwwmRILYPNkpXh3FC7KOxckhrY+ghrxW7yM
         thrKJC5KLgSedAyi1h6fZpCy99pmqDzMZhMXSHT36KVE1Zikch1v8lGxDCx/UOFA9U
         /RWBC0nULjwIbrYiS6sZeb1oukMtx5mHLgpJsiqQ=
Date:   Tue, 8 Nov 2022 18:10:20 +0100
From:   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To:     Luiz Capitulino <luizcap@amazon.com>
Cc:     stable@vger.kernel.org, lcapitulino@gmail.com,
        Vasily Averin <vvs@virtuozzo.com>,
        Shakeel Butt <shakeelb@google.com>,
        Alexander Viro <viro@zeniv.linux.org.uk>,
        Alexey Dobriyan <adobriyan@gmail.com>,
        Andrei Vagin <avagin@gmail.com>,
        Borislav Petkov <bp@alien8.de>, Borislav Petkov <bp@suse.de>,
        Christian Brauner <christian.brauner@ubuntu.com>,
        Dmitry Safonov <0x7f454c46@gmail.com>,
        "Eric W. Biederman" <ebiederm@xmission.com>,
        "H. Peter Anvin" <hpa@zytor.com>, Ingo Molnar <mingo@redhat.com>,
        "J. Bruce Fields" <bfields@fieldses.org>,
        Jeff Layton <jlayton@kernel.org>, Jens Axboe <axboe@kernel.dk>,
        Jiri Slaby <jirislaby@kernel.org>,
        Johannes Weiner <hannes@cmpxchg.org>,
        Kirill Tkhai <ktkhai@virtuozzo.com>,
        Michal Hocko <mhocko@kernel.org>,
        Oleg Nesterov <oleg@redhat.com>, Roman Gushchin <guro@fb.com>,
        Serge Hallyn <serge@hallyn.com>, Tejun Heo <tj@kernel.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Vladimir Davydov <vdavydov.dev@gmail.com>,
        Yutian Yang <nglaive@gmail.com>,
        Zefan Li <lizefan.x@bytedance.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH 5.10, 5.4] memcg: enable accounting of ipc resources
Message-ID: <Y2qNfMiIM/+4h6c4@kroah.com>
References: <20221104184131.17797-1-luizcap@amazon.com>
 <Y2jMXfbLTHwDBInx@kroah.com>
 <Y2pPhBL2g8fmqdql@kroah.com>
 <20221108165116.GA9011@dev-dsk-luizcap-1d-af6a6fef.us-east-1.amazon.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20221108165116.GA9011@dev-dsk-luizcap-1d-af6a6fef.us-east-1.amazon.com>
Precedence: bulk
List-ID: <stable.vger.kernel.org>
X-Mailing-List: stable@vger.kernel.org

On Tue, Nov 08, 2022 at 04:51:16PM +0000, Luiz Capitulino wrote:
> On Tue, Nov 08, 2022 at 01:45:56PM +0100, Greg Kroah-Hartman wrote:
> 
> > 
> > 
> > On Mon, Nov 07, 2022 at 10:14:05AM +0100, Greg Kroah-Hartman wrote:
> > > On Fri, Nov 04, 2022 at 06:41:31PM +0000, Luiz Capitulino wrote:
> > > > From: Vasily Averin <vvs@virtuozzo.com>
> > > >
> > > > Commit 18319498fdd4cdf8c1c2c48cd432863b1f915d6f upstream.
> > > >
> > > > [ This backport fixes CVE-2021-3759 for 5.10 and 5.4. Please, note that
> > > >   it caused conflicts in all files being changed because upstream
> > > >   changed ipc object allocation to and from kvmalloc() & friends (eg.
> > > >   commits bc8136a543aa and fc37a3b8b4388e). However, I decided to keep
> > > >   this backport about the memcg accounting fix only. ]
> > >
> > > Looks good, now queued up, thanks.
> > 
> > Ah, but you missed a fix-up patch for this one {sigh}
> > 
> > I've now queued up 18319498fdd4 ("memcg: enable accounting of ipc
> > resources") as well.  Please be more careful in the future when
> > backporting changes that you also include the fixes for those changes.
> 
> Good catch, the fixup is actually 6a4746ba06191e23d30230738e94334b26590a8a

Oops, yes, wrong git id in my clipboard buffer.