[Armadeus-commitlog] UNNAMED PROJECT branch, opos6ul-2018.05, updated. 728e5627c867857870ffec9ff86aca3ed4fd1cc8

[Sébastien S. <ss...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, opos6ul-2018.05 has been updated
       via  728e5627c867857870ffec9ff86aca3ed4fd1cc8 (commit)
       via  00c8c1b4d2c6acdfbede7e77e367a3d8382f3f83 (commit)
      from  256720b4c11ef549f0e5817253fe15fd196cdd4f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 728e5627c867857870ffec9ff86aca3ed4fd1cc8
Author: Sébastien Szymanski <seb...@ar...>
Date:   Fri Mar 22 09:33:52 2019 +0100

    fs: ext4: do not write on filesystem with metadata_csum feature
    
    U-Boot doesn't support metadata_csum feature. Writing to filesystem with
    metadata_csum feature makes the filesystem corrupted and unbootable by
    Linux:
    
    [    2.527495] EXT4-fs (mmcblk0p2): ext4_check_descriptors: Checksum for group 0 failed (52188!=0)
    [    2.537421] EXT4-fs (mmcblk0p2): ext4_check_descriptors: Checksum for group 1 failed (5262!=0)
    ...
    [    2.653308] EXT4-fs (mmcblk0p2): ext4_check_descriptors: Checksum for group 14 failed (42611!=0)
    [    2.662179] EXT4-fs (mmcblk0p2): ext4_check_descriptors: Checksum for group 15 failed (21527!=0)
    [    2.687920] JBD2: journal checksum error
    [    2.691982] EXT4-fs (mmcblk0p2): error loading journal
    [    2.698292] VFS: Cannot open root device "mmcblk0p2" or unknown-block(179,2): error -74
    
    Don't write to filesystem with meatadata_csum feature to not corrupt the
    filesystem.
    
    Signed-off-by: Sébastien Szymanski <seb...@ar...>
    (cherry picked from commit 2e7365518acdb8fb6e9be332c8a6c57b457188d9)

commit 00c8c1b4d2c6acdfbede7e77e367a3d8382f3f83
Author: Eugen Hristev <eug...@mi...>
Date:   Wed May 9 16:28:37 2018 +0300

    fs: ext4: fix crash on ext4ls
    
    Found a crash while issuing ext4ls with a non-existent directory.
    Crash test:
    
    => ext4ls mmc 0 1
    ** Can not find directory. **
    data abort
    pc : [<3fd7c2ec>]          lr : [<3fd93ed8>]
    reloc pc : [<26f142ec>]    lr : [<26f2bed8>]
    sp : 3f963338  ip : 3fdc3dc4     fp : 3fd6b370
    r10: 00000004  r9 : 3f967ec0     r8 : 3f96db68
    r7 : 3fdc99b4  r6 : 00000000     r5 : 3f96dc88  r4 : 3fdcbc8c
    r3 : fffffffa  r2 : 00000000     r1 : 3f96e0bc  r0 : 00000002
    Flags: nZCv  IRQs off  FIQs off  Mode SVC_32
    Resetting CPU ...
    
    resetting ...
    
    Tested on SAMA5D2_Xplained board (sama5d2_xplained_mmc_defconfig)
    
    Looks like crash is introduced by commit:
    "fa9ca8a" fs/ext4/ext4fs.c: Free dirnode in error path of ext4fs_ls
    
    Issue is that dirnode is not initialized, and then freed if the call
    to ext4_ls fails. ext4_ls will not change the value of dirnode in this case
    thus we have a crash with data abort.
    
    I added initialization and a check for dirname being NULL.
    
    Fixes: "fa9ca8a" fs/ext4/ext4fs.c: Free dirnode in error path of ext4fs_ls
    Cc: Stefan Brüns <ste...@rw...>
    Cc: Tom Rini <tr...@ko...>
    Signed-off-by: Eugen Hristev <eug...@mi...>
    Reviewed-by: Tom Rini <tr...@ko...>
    (cherry picked from commit e71a969cea56eb3e93de3320df5ce44c9e4e1c53)

-----------------------------------------------------------------------

Summary of changes:
 fs/ext4/ext4_write.c | 6 ++++++
 fs/ext4/ext4fs.c     | 5 +++--
 include/ext4fs.h     | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c
index a7f543f7df..4eb77c327e 100644
--- a/fs/ext4/ext4_write.c
+++ b/fs/ext4/ext4_write.c
@@ -864,6 +864,12 @@ int ext4fs_write(const char *fname, unsigned char *buffer,
 		printf("error in File System init\n");
 		return -1;
 	}
+
+	if (le32_to_cpu(fs->sb->feature_ro_compat) & EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) {
+		printf("Unsupported feature metadata_csum found, not writing.\n");
+		return -1;
+	}
+
 	inodes_per_block = fs->blksz / fs->inodesz;
 	parent_inodeno = ext4fs_get_parent_inode_num(fname, filename, F_FILE);
 	if (parent_inodeno == -1)
diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index 4b36a3e608..2a28031d14 100644
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -164,7 +164,7 @@ int ext4fs_read_file(struct ext2fs_node *node, loff_t pos,
 
 int ext4fs_ls(const char *dirname)
 {
-	struct ext2fs_node *dirnode;
+	struct ext2fs_node *dirnode = NULL;
 	int status;
 
 	if (dirname == NULL)
@@ -174,7 +174,8 @@ int ext4fs_ls(const char *dirname)
 				  FILETYPE_DIRECTORY);
 	if (status != 1) {
 		printf("** Can not find directory. **\n");
-		ext4fs_free_node(dirnode, &ext4fs_root->diropen);
+		if (dirnode)
+			ext4fs_free_node(dirnode, &ext4fs_root->diropen);
 		return 1;
 	}
 
diff --git a/include/ext4fs.h b/include/ext4fs.h
index bb55639107..2421011341 100644
--- a/include/ext4fs.h
+++ b/include/ext4fs.h
@@ -32,6 +32,7 @@
 #define EXT4_EXTENTS_FL		0x00080000 /* Inode uses extents */
 #define EXT4_EXT_MAGIC			0xf30a
 #define EXT4_FEATURE_RO_COMPAT_GDT_CSUM	0x0010
+#define EXT4_FEATURE_RO_COMPAT_METADATA_CSUM 0x0400
 #define EXT4_FEATURE_INCOMPAT_EXTENTS	0x0040
 #define EXT4_FEATURE_INCOMPAT_64BIT	0x0080
 #define EXT4_INDIRECT_BLOCKS		12


hooks/post-receive
-- 
UNNAMED PROJECT