From 7c800e460661972925a7acab51f023d0b38161b5 Mon Sep 17 00:00:00 2001 From: Li Dongyang Date: Wed, 19 Dec 2018 14:03:14 +1100 Subject: [PATCH 1/1] LU-11790 ldiskfs: add terminating u32 when expanding inodes In ext4_expand_extra_isize_ea(), we calculate the total size of the xattr header, plus the xattr entries so we know how much of the beginning part of the xattrs to move when expanding the inode extra size. We need to include the terminating u32 at the end of the xattr entries, or else if there is uninitialized, non-zero bytes after the xattr entries and before the xattr values, the list of xattr entries won't be properly terminated. Signed-off-by: Li Dongyang Change-Id: I247b935b3cf315481dc4658133a7eee02b6350e9 Reviewed-on: https://review.whamcloud.com/33893 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Yang Sheng Reviewed-by: Andreas Dilger Reviewed-by: Alex Zhuravlev --- ...ze-of-xattr-entries-when-expanding-inodes.patch | 31 ++++++++++++++++++++++ ...ze-of-xattr-entries-when-expanding-inodes.patch | 31 ++++++++++++++++++++++ .../series/ldiskfs-2.6-rhel6.4.series | 1 + .../series/ldiskfs-2.6-rhel6.5.series | 1 + .../series/ldiskfs-2.6-rhel6.6.series | 1 + .../series/ldiskfs-2.6-rhel6.7.series | 1 + .../series/ldiskfs-2.6-rhel6.8.series | 1 + .../series/ldiskfs-2.6-rhel6.9.series | 1 + .../kernel_patches/series/ldiskfs-2.6-rhel6.series | 1 + .../series/ldiskfs-2.6-sles11.series | 1 + .../series/ldiskfs-3.0-sles11.series | 1 + .../series/ldiskfs-3.0-sles11sp3.series | 1 + .../series/ldiskfs-3.0-sles11sp4.series | 1 + .../series/ldiskfs-3.10-rhel7.2.series | 1 + .../series/ldiskfs-3.10-rhel7.3.series | 1 + .../series/ldiskfs-3.10-rhel7.4.series | 1 + .../series/ldiskfs-3.10-rhel7.5.series | 1 + .../series/ldiskfs-3.10-rhel7.6.series | 1 + .../series/ldiskfs-3.10-rhel7.series | 1 + .../series/ldiskfs-3.12-sles12.series | 1 + .../series/ldiskfs-3.12-sles12sp1.series | 1 + .../series/ldiskfs-4.15.0-20-ubuntu18.series | 1 + .../series/ldiskfs-4.15.0-24-ubuntu18.series | 1 + .../series/ldiskfs-4.4-sles12sp2.series | 1 + .../series/ldiskfs-4.4-sles12sp3.series | 1 + .../series/ldiskfs-4.4.0-45-ubuntu14+16.series | 1 + .../series/ldiskfs-4.4.0-49-ubuntu14+16.series | 1 + .../series/ldiskfs-4.4.0-62-ubuntu14+16.series | 1 + .../series/ldiskfs-4.4.0-73-ubuntu14+16.series | 1 + 29 files changed, 89 insertions(+) create mode 100644 ldiskfs/kernel_patches/patches/rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch create mode 100644 ldiskfs/kernel_patches/patches/ubuntu18/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/patches/rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch b/ldiskfs/kernel_patches/patches/rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch new file mode 100644 index 0000000..4276336 --- /dev/null +++ b/ldiskfs/kernel_patches/patches/rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch @@ -0,0 +1,31 @@ +Date: Fri, 14 Dec 2018 22:43:43 -0500 +From: "Theodore Ts'o" +List-Id: + +In ext4_expand_extra_isize_ea(), we calculate the total size of the +xattr header, plus the xattr entries so we know how much of the +beginning part of the xattrs to move when expanding the inode extra +size. We need to include the terminating u32 at the end of the xattr +entries, or else if there is uninitialized, non-zero bytes after the +xattr entries and before the xattr values, the list of xattr entries +won't be properly terminated. + +Reported-by: Steve Graham +Signed-off-by: Theodore Ts'o +--- + fs/ext4/xattr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: linux-3.10.0-862.14.4.el7/fs/ext4/xattr.c +=================================================================== +--- linux-3.10.0-862.14.4.el7.orig/fs/ext4/xattr.c ++++ linux-3.10.0-862.14.4.el7/fs/ext4/xattr.c +@@ -1628,7 +1628,7 @@ retry: + end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size; + min_offs = end - base; + last = entry; +- total_ino = sizeof(struct ext4_xattr_ibody_header); ++ total_ino = sizeof(struct ext4_xattr_ibody_header) + sizeof(u32); + + ifree = ext4_xattr_free_space(last, &min_offs, base, &total_ino); + if (ifree >= isize_diff) diff --git a/ldiskfs/kernel_patches/patches/ubuntu18/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch b/ldiskfs/kernel_patches/patches/ubuntu18/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch new file mode 100644 index 0000000..3cfbba8 --- /dev/null +++ b/ldiskfs/kernel_patches/patches/ubuntu18/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch @@ -0,0 +1,31 @@ +Date: Fri, 14 Dec 2018 22:43:43 -0500 +From: "Theodore Ts'o" +List-Id: + +In ext4_expand_extra_isize_ea(), we calculate the total size of the +xattr header, plus the xattr entries so we know how much of the +beginning part of the xattrs to move when expanding the inode extra +size. We need to include the terminating u32 at the end of the xattr +entries, or else if there is uninitialized, non-zero bytes after the +xattr entries and before the xattr values, the list of xattr entries +won't be properly terminated. + +Reported-by: Steve Graham +Signed-off-by: Theodore Ts'o +--- + fs/ext4/xattr.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c +index 7fddd519adae..86ed9c686249 100644 +--- a/fs/ext4/xattr.c ++++ b/fs/ext4/xattr.c +@@ -2722,7 +2722,7 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, + base = IFIRST(header); + end = (void *)raw_inode + EXT4_SB(inode->i_sb)->s_inode_size; + min_offs = end - base; +- total_ino = sizeof(struct ext4_xattr_ibody_header); ++ total_ino = sizeof(struct ext4_xattr_ibody_header) + sizeof(u32); + + error = xattr_check_inode(inode, header, end); + if (error) diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series index cd26356..95dcc19 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.4.series @@ -46,3 +46,4 @@ rhel6.3/ext4-dont-check-in-ro.patch rhel6.3/ext4-dont-check-before-replay.patch rhel7/ext4-export-orphan-add.patch rhel6.3/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.5.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.5.series index f96d650..f1e4ad2 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.5.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.5.series @@ -50,3 +50,4 @@ rhel6.3/ext4-dont-check-before-replay.patch rhel6.5/ext4-brackets-in-ext4-remove-blocks.patch rhel7/ext4-export-orphan-add.patch rhel6.3/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.6.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.6.series index 792bf57..43626ef 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.6.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.6.series @@ -50,3 +50,4 @@ rhel6.5/ext4-fix-journal-quota.patch rhel6.5/ext4-brackets-in-ext4-remove-blocks.patch rhel7/ext4-export-orphan-add.patch rhel6.6/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.7.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.7.series index 2a4cf15..8764160 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.7.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.7.series @@ -49,3 +49,4 @@ rhel6.5/ext4-fix-journal-quota.patch rhel6.5/ext4-brackets-in-ext4-remove-blocks.patch rhel7/ext4-export-orphan-add.patch rhel6.6/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.8.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.8.series index 33f89a1..a135027 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.8.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.8.series @@ -47,3 +47,4 @@ rhel6.5/ext4-fix-journal-quota.patch rhel6.5/ext4-brackets-in-ext4-remove-blocks.patch rhel7/ext4-export-orphan-add.patch rhel6.6/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.9.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.9.series index b3245f0..7a241ee 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.9.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.9.series @@ -46,3 +46,4 @@ rhel6.6/ext4_s_max_ext_tree_depth.patch rhel6.5/ext4-fix-journal-quota.patch rhel7/ext4-export-orphan-add.patch rhel6.6/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.series index e9c932e..18c9f26 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-rhel6.series @@ -45,3 +45,4 @@ rhel6.3/ext4-dont-check-in-ro.patch rhel6.3/ext4-dont-check-before-replay.patch rhel7/ext4-export-orphan-add.patch rhel6.3/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series index 9366cec..80f09ed 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-2.6-sles11.series @@ -45,3 +45,4 @@ rhel6.3/ext4-notalloc_under_idatasem.patch rhel6.5/ext4-fix-journal-quota.patch rhel7/ext4-export-orphan-add.patch rhel6.3/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series index 41c8bc2..a6187d2 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11.series @@ -41,3 +41,4 @@ sles11sp1/ext4-notalloc_under_idatasem.patch rhel6.5/ext4-fix-journal-quota.patch rhel7/ext4-export-orphan-add.patch sles11sp2/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series index b2f1289..7558269 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp3.series @@ -45,3 +45,4 @@ sles11sp3/ext4-dont-check-before-replay.patch rhel6.3/ext4-dont-check-in-ro.patch rhel7/ext4-export-orphan-add.patch sles11sp2/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp4.series b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp4.series index c838753..799e625 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp4.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.0-sles11sp4.series @@ -45,3 +45,4 @@ sles11sp3/ext4-dont-check-before-replay.patch rhel6.3/ext4-dont-check-in-ro.patch rhel7/ext4-export-orphan-add.patch sles11sp2/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.2.series b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.2.series index fc26a2b..530cb3a 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.2.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.2.series @@ -36,3 +36,4 @@ rhel7.2/ext4-preread-gd.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.3.series b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.3.series index 3628d29..53a3078 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.3.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.3.series @@ -36,3 +36,4 @@ rhel7.2/ext4-preread-gd.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.4.series b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.4.series index 5e8d73f..b78efbc 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.4.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.4.series @@ -36,3 +36,4 @@ rhel7.2/ext4-preread-gd.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.5.series b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.5.series index c73299b..33c2ddf 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.5.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.5.series @@ -35,3 +35,4 @@ rhel7.2/ext4-preread-gd.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.6.series b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.6.series index b3ffd2c..128de77 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.6.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.6.series @@ -35,3 +35,4 @@ rhel7.2/ext4-preread-gd.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.series b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.series index a1a7206..5066e5a 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.10-rhel7.series @@ -31,3 +31,4 @@ rhel7/ext4-cleanup-goto-next-group.patch rhel7/ext4-reduce-lock-contention-in-__ext4_new_inode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12.series b/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12.series index e0a3240..b35c55c 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12.series @@ -22,3 +22,4 @@ rhel7/ext4-mmp-brelse.patch rhel7/ext4-jcb-optimization.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series b/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series index 823a523..ae72316 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-3.12-sles12sp1.series @@ -23,3 +23,4 @@ rhel7/ext4-jcb-optimization.patch sles12sp1/ext4-attach-jinode-in-writepages.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series index ba341ba..46114cd 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-20-ubuntu18.series @@ -21,3 +21,4 @@ ubuntu18/ext4-dont-check-before-replay.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +ubuntu18/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series index ebb7a12..69f0dc9 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.15.0-24-ubuntu18.series @@ -21,3 +21,4 @@ ubuntu18/ext4-dont-check-before-replay.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +ubuntu18/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.4-sles12sp2.series b/ldiskfs/kernel_patches/series/ldiskfs-4.4-sles12sp2.series index d163e22..d3d1765 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-4.4-sles12sp2.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.4-sles12sp2.series @@ -27,3 +27,4 @@ sles12sp2/ext4-fix-xattr-shifting-when-expanding-inodes.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.4-sles12sp3.series b/ldiskfs/kernel_patches/series/ldiskfs-4.4-sles12sp3.series index 23abb61..03fc6e3 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-4.4-sles12sp3.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.4-sles12sp3.series @@ -26,3 +26,4 @@ rhel7.2/ext4-dont-check-in-ro.patch sles12sp2/ext4-fix-xattr-shifting-when-expanding-inodes.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-45-ubuntu14+16.series b/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-45-ubuntu14+16.series index dbda4d1..2617d3f 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-45-ubuntu14+16.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-45-ubuntu14+16.series @@ -24,3 +24,4 @@ sles12sp2/ext4-attach-jinode-in-writepages.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-49-ubuntu14+16.series b/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-49-ubuntu14+16.series index dfd8291..f7ab192 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-49-ubuntu14+16.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-49-ubuntu14+16.series @@ -24,3 +24,4 @@ sles12sp2/ext4-attach-jinode-in-writepages.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-62-ubuntu14+16.series b/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-62-ubuntu14+16.series index ac709d0..072fe21 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-62-ubuntu14+16.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-62-ubuntu14+16.series @@ -24,3 +24,4 @@ sles12sp2/ext4-attach-jinode-in-writepages.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch diff --git a/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-73-ubuntu14+16.series b/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-73-ubuntu14+16.series index cce46c8..69bf394 100644 --- a/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-73-ubuntu14+16.series +++ b/ldiskfs/kernel_patches/series/ldiskfs-4.4.0-73-ubuntu14+16.series @@ -24,3 +24,4 @@ sles12sp2/ext4-attach-jinode-in-writepages.patch rhel7/ext4-use-GFP_NOFS-in-ext4_inode_attach_jinode.patch rhel7/ext4-export-orphan-add.patch rhel7/ext4-mmp-dont-mark-bh-dirty.patch +rhel7/ext4-include-terminating-u32-in-size-of-xattr-entries-when-expanding-inodes.patch -- 1.8.3.1