From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.99]:40512 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726986AbeJPVyf (ORCPT ); Tue, 16 Oct 2018 17:54:35 -0400 Date: Tue, 16 Oct 2018 16:03:55 +0200 From: Greg KH To: Chenbo Feng Cc: stable@vger.kernel.org, kernel-team@android.com, Theodore Ts'o , stable@kernel.org Subject: Re: [4.9.y v2] ext4: avoid running out of journal credits when appending to an inline file Message-ID: <20181016140355.GF20256@kroah.com> References: <20181011185142.104586-1-fengc@google.com> <20181011185142.104586-2-fengc@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181011185142.104586-2-fengc@google.com> Sender: stable-owner@vger.kernel.org List-ID: On Thu, Oct 11, 2018 at 11:51:42AM -0700, Chenbo Feng wrote: > From: Theodore Ts'o > > commit 8bc1379b82b8e809eef77a9fedbb75c6c297be19 upstream. > > Use a separate journal transaction if it turns out that we need to > convert an inline file to use an data block. Otherwise we could end > up failing due to not having journal credits. > > This addresses CVE-2018-10883. > > https://bugzilla.kernel.org/show_bug.cgi?id=200071 > > Change-Id: Ifbe92e379f7a25fb252a2584356ccb91f902ea8f > Signed-off-by: Theodore Ts'o > Cc: stable@kernel.org > [fengc@google.com: 4.4 and 4.9 backport: adjust context] > Signed-off-by: Chenbo Feng > --- > fs/ext4/ext4.h | 3 --- > fs/ext4/inline.c | 38 +------------------------------------- > fs/ext4/xattr.c | 18 ++---------------- > 3 files changed, 3 insertions(+), 56 deletions(-) This patch still does not apply to the latest 4.9 stable tree, can you rebase these again? There's been a lot of patches happening in this area recently, sorry. greg k-h