e2fsck: check xattr 'system.data' before setting inline_data feature

Message ID 20181030061501.24406-1-dongyangli@ddn.com
State New
Headers show
Series
  • e2fsck: check xattr 'system.data' before setting inline_data feature
Related show

Commit Message

Li Dongyang Oct. 30, 2018, 6:15 a.m.
ext2fs_inline_data_size will happy return 0 and set size to
EXT4_MIN_INLINE_DATA_SIZE even when inode doesn't have
xattr 'system.data', a corrupted i_flags could make e2fsck
enable the inline_data on the superblock.

We should only offer to enable inline_data when i_flags is set
and xattr 'system.data' can be found.

Signed-off-by: Li Dongyang <dongyangli@ddn.com>
---
 e2fsck/pass1.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Theodore Ts'o Nov. 15, 2018, 5:54 p.m. | #1
On Tue, Oct 30, 2018 at 05:15:01PM +1100, Li Dongyang wrote:
> ext2fs_inline_data_size will happy return 0 and set size to
> EXT4_MIN_INLINE_DATA_SIZE even when inode doesn't have
> xattr 'system.data', a corrupted i_flags could make e2fsck
> enable the inline_data on the superblock.
> 
> We should only offer to enable inline_data when i_flags is set
> and xattr 'system.data' can be found.
> 
> Signed-off-by: Li Dongyang <dongyangli@ddn.com>

Thanks, applied.

					- Ted
Theodore Ts'o Nov. 15, 2018, 5:57 p.m. | #2
On Thu, Nov 15, 2018 at 12:54:31PM -0500, Theodore Y. Ts'o wrote:
> On Tue, Oct 30, 2018 at 05:15:01PM +1100, Li Dongyang wrote:
> > ext2fs_inline_data_size will happy return 0 and set size to
> > EXT4_MIN_INLINE_DATA_SIZE even when inode doesn't have
> > xattr 'system.data', a corrupted i_flags could make e2fsck
> > enable the inline_data on the superblock.
> > 
> > We should only offer to enable inline_data when i_flags is set
> > and xattr 'system.data' can be found.
> > 
> > Signed-off-by: Li Dongyang <dongyangli@ddn.com>
> 
> Thanks, applied.

Oops, I see there's a V2 version of this patch.

      	    	      	 	 - Ted

Patch

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 8abf0c33..45534388 100644
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -1496,8 +1496,8 @@  void e2fsck_pass1(e2fsck_t ctx)
 		    (ino >= EXT2_FIRST_INODE(fs->super))) {
 			size_t size = 0;
 
-			pctx.errcode = ext2fs_inline_data_size(fs, ino, &size);
-			if (!pctx.errcode && size &&
+			pctx.errcode = get_inline_data_ea_size(fs, ino, &size);
+			if (!pctx.errcode &&
 			    fix_problem(ctx, PR_1_INLINE_DATA_FEATURE, &pctx)) {
 				ext2fs_set_feature_inline_data(sb);
 				ext2fs_mark_super_dirty(fs);