On Thu, Oct 11, 2018 at 11:51:42AM -0700, Chenbo Feng wrote: > From: Theodore Ts'o <tytso@xxxxxxx> > > 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 <tytso@xxxxxxx> > Cc: stable@xxxxxxxxxx > [fengc@xxxxxxxxxx: 4.4 and 4.9 backport: adjust context] > Signed-off-by: Chenbo Feng <fengc@xxxxxxxxxx> > --- > 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
