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>
This commit is contained in:
Stefan Brüns 2016-09-06 04:36:45 +02:00 committed by Tom Rini
parent a321abd54f
commit 10a7a1b8ba
2 changed files with 6 additions and 0 deletions

View File

@ -881,6 +881,11 @@ int ext4fs_write(const char *fname, unsigned char *buffer,
goto fail; goto fail;
if (ext4fs_iget(parent_inodeno, g_parent_inode)) if (ext4fs_iget(parent_inodeno, g_parent_inode))
goto fail; 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 */ /* check if the filename is already present in root */
existing_file_inodeno = ext4fs_filename_unlink(filename); existing_file_inodeno = ext4fs_filename_unlink(filename);
if (existing_file_inodeno != -1) { if (existing_file_inodeno != -1) {

View File

@ -28,6 +28,7 @@
#define __EXT4__ #define __EXT4__
#include <ext_common.h> #include <ext_common.h>
#define EXT4_INDEX_FL 0x00001000 /* Inode uses hash tree index */
#define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */
#define EXT4_EXT_MAGIC 0xf30a #define EXT4_EXT_MAGIC 0xf30a
#define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010 #define EXT4_FEATURE_RO_COMPAT_GDT_CSUM 0x0010