mbox series

[0/5] Backport to 4.9- ext4: protect journal inode's blocks using block_validity

Message ID cover.1587713792.git.ashwinh@vmware.com
Headers show
Series Backport to 4.9- ext4: protect journal inode's blocks using block_validity | expand

Message

Ashwin H April 29, 2020, 7:21 p.m. UTC
[PATCH 1/5] ext4: avoid declaring fs inconsistent due to invalid file
handles
This patch is backported as functionality in this commit is used by
Patch 2 in this patchset.

[PATCH 2/5] ext4: protect journal inode's blocks using block_validity
Backport to 4.9

[PATCH 3/5] ext4: don't perform block validity checks on the journal
[PATCH 4/5] ext4: fix block validity checks for journal inodes using
[PATCH 5/5] ext4: unsigned int compared against zero
Fixes issues found in Patch 2 in this patchset.

These patches addresses CVE-2019-19319

Colin Ian King (1):
  ext4: unsigned int compared against zero

Theodore Ts'o (4):
  ext4: avoid declaring fs inconsistent due to invalid file handles
  ext4: protect journal inode's blocks using block_validity
  ext4: don't perform block validity checks on the journal inode
  ext4: fix block validity checks for journal inodes using indirect
    blocks

 fs/ext4/block_validity.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++
 fs/ext4/ext4.h           | 15 ++++++++++++--
 fs/ext4/extents.c        | 12 +++++++----
 fs/ext4/ialloc.c         |  2 +-
 fs/ext4/inode.c          | 48 ++++++++++++++++++++++++++++++------------
 fs/ext4/ioctl.c          |  2 +-
 fs/ext4/namei.c          |  4 ++--
 fs/ext4/resize.c         |  5 +++--
 fs/ext4/super.c          | 19 +++++------------
 9 files changed, 122 insertions(+), 39 deletions(-)

Comments

Greg Kroah-Hartman April 29, 2020, 12:59 p.m. UTC | #1
On Thu, Apr 30, 2020 at 12:51:34AM +0530, ashwin-h wrote:
> [PATCH 1/5] ext4: avoid declaring fs inconsistent due to invalid file
> handles
> This patch is backported as functionality in this commit is used by
> Patch 2 in this patchset.
> 
> [PATCH 2/5] ext4: protect journal inode's blocks using block_validity
> Backport to 4.9
> 
> [PATCH 3/5] ext4: don't perform block validity checks on the journal
> [PATCH 4/5] ext4: fix block validity checks for journal inodes using
> [PATCH 5/5] ext4: unsigned int compared against zero
> Fixes issues found in Patch 2 in this patchset.
> 
> These patches addresses CVE-2019-19319

I can't take patches for 4.9 that are not also in 4.14, for the obvious
reason that you never want to upgrade to a newer kernel and get
regressions.

So can you provide a backported series for the 4.14 tree too?  Then I
can take these.

thanks,

greg k-h
Ashwin H April 29, 2020, 8:39 p.m. UTC | #2
I have sent patches for 4.14 tree

Thanks,
Ashwin

´╗┐On 29/04/20, 6:29 PM, "Greg KH" <gregkh@linuxfoundation.org> wrote:

    On Thu, Apr 30, 2020 at 12:51:34AM +0530, ashwin-h wrote:
    > [PATCH 1/5] ext4: avoid declaring fs inconsistent due to invalid file
    > handles
    > This patch is backported as functionality in this commit is used by
    > Patch 2 in this patchset.
    > 
    > [PATCH 2/5] ext4: protect journal inode's blocks using block_validity
    > Backport to 4.9
    > 
    > [PATCH 3/5] ext4: don't perform block validity checks on the journal
    > [PATCH 4/5] ext4: fix block validity checks for journal inodes using
    > [PATCH 5/5] ext4: unsigned int compared against zero
    > Fixes issues found in Patch 2 in this patchset.
    > 
    > These patches addresses CVE-2019-19319
    
    I can't take patches for 4.9 that are not also in 4.14, for the obvious
    reason that you never want to upgrade to a newer kernel and get
    regressions.
    
    So can you provide a backported series for the 4.14 tree too?  Then I
    can take these.
    
    thanks,
    
    greg k-h
Greg Kroah-Hartman May 1, 2020, 12:10 p.m. UTC | #3
On Wed, Apr 29, 2020 at 08:39:45PM +0000, Ashwin H wrote:
> I have sent patches for 4.14 tree

Thank you, all of these are now queued up.

greg k-h