diff options
| author | Stefan Brüns <stefan.bruens@rwth-aachen.de> | 2016-09-06 04:36:45 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-09-23 09:02:37 -0400 |
| commit | 10a7a1b8babbdd5684684da31482eab1931316f0 (patch) | |
| tree | df0ba5bf0a6a92dde90ce37dd943149ecd172dfb | |
| parent | a321abd54fa025114df2002b33ea17adc6b998b7 (diff) | |
| download | u-boot-10a7a1b8babbdd5684684da31482eab1931316f0.tar.gz u-boot-10a7a1b8babbdd5684684da31482eab1931316f0.tar.bz2 u-boot-10a7a1b8babbdd5684684da31482eab1931316f0.zip | |
ext4: Avoid corruption of directories with hash tree indexes
While directories can be read using the old linear scan method, adding a
new file would require updating the index tree (alternatively, the whole
tree could be removed).
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
| -rw-r--r-- | fs/ext4/ext4_write.c | 5 | ||||
| -rw-r--r-- | include/ext4fs.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/fs/ext4/ext4_write.c b/fs/ext4/ext4_write.c index a52804e8e1..8554793f4f 100644 --- a/fs/ext4/ext4_write.c +++ b/fs/ext4/ext4_write.c @@ -881,6 +881,11 @@ int ext4fs_write(const char *fname, unsigned char *buffer, goto fail; if (ext4fs_iget(parent_inodeno, g_parent_inode)) goto fail; + /* do not mess up a directory using hash trees */ + if (le32_to_cpu(g_parent_inode->flags) & EXT4_INDEX_FL) { + printf("hash tree directory\n"); + goto fail; + } /* check if the filename is already present in root */ existing_file_inodeno = ext4fs_filename_unlink(filename); if (existing_file_inodeno != -1) { diff --git a/include/ext4fs.h b/include/ext4fs.h index e3f6216fa9..6e31c73812 100644 --- a/include/ext4fs.h +++ b/include/ext4fs.h @@ -28,6 +28,7 @@ #define __EXT4__ #include <ext_common.h> +#define EXT4_INDEX_FL 0x00001000 /* Inode uses hash tree index */ #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EXT_MAGIC 0xf30a #define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010 |