mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 15:40:29 +09:00
ext4: initialize full inode for inodes bigger than 128 bytes
Make sure the the extra_isize field (offset 128) is initialized to 0, to mark any extra data as invalid. Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
This commit is contained in:
parent
290ce2f95a
commit
87f9fdc08d
@ -560,7 +560,7 @@ static int ext4fs_delete_file(int inodeno)
|
|||||||
|
|
||||||
read_buffer = read_buffer + blkoff;
|
read_buffer = read_buffer + blkoff;
|
||||||
inode_buffer = (struct ext2_inode *)read_buffer;
|
inode_buffer = (struct ext2_inode *)read_buffer;
|
||||||
memset(inode_buffer, '\0', sizeof(struct ext2_inode));
|
memset(inode_buffer, '\0', fs->inodesz);
|
||||||
|
|
||||||
/* write the inode to original position in inode table */
|
/* write the inode to original position in inode table */
|
||||||
if (ext4fs_put_metadata(start_block_address, blkno))
|
if (ext4fs_put_metadata(start_block_address, blkno))
|
||||||
@ -866,7 +866,7 @@ int ext4fs_write(const char *fname, unsigned char *buffer,
|
|||||||
ALLOC_CACHE_ALIGN_BUFFER(char, filename, 256);
|
ALLOC_CACHE_ALIGN_BUFFER(char, filename, 256);
|
||||||
memset(filename, 0x00, 256);
|
memset(filename, 0x00, 256);
|
||||||
|
|
||||||
g_parent_inode = zalloc(sizeof(struct ext2_inode));
|
g_parent_inode = zalloc(fs->inodesz);
|
||||||
if (!g_parent_inode)
|
if (!g_parent_inode)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
@ -969,8 +969,7 @@ int ext4fs_write(const char *fname, unsigned char *buffer,
|
|||||||
if (ext4fs_log_journal(temp_ptr, parent_itable_blkno))
|
if (ext4fs_log_journal(temp_ptr, parent_itable_blkno))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
memcpy(temp_ptr + blkoff, g_parent_inode,
|
memcpy(temp_ptr + blkoff, g_parent_inode, fs->inodesz);
|
||||||
sizeof(struct ext2_inode));
|
|
||||||
if (ext4fs_put_metadata(temp_ptr, parent_itable_blkno))
|
if (ext4fs_put_metadata(temp_ptr, parent_itable_blkno))
|
||||||
goto fail;
|
goto fail;
|
||||||
} else {
|
} else {
|
||||||
@ -978,8 +977,7 @@ int ext4fs_write(const char *fname, unsigned char *buffer,
|
|||||||
* If parent and child fall in same inode table block
|
* If parent and child fall in same inode table block
|
||||||
* both should be kept in 1 buffer
|
* both should be kept in 1 buffer
|
||||||
*/
|
*/
|
||||||
memcpy(temp_ptr + blkoff, g_parent_inode,
|
memcpy(temp_ptr + blkoff, g_parent_inode, fs->inodesz);
|
||||||
sizeof(struct ext2_inode));
|
|
||||||
gd_index--;
|
gd_index--;
|
||||||
if (ext4fs_put_metadata(temp_ptr, itable_blkno))
|
if (ext4fs_put_metadata(temp_ptr, itable_blkno))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
Loading…
Reference in New Issue
Block a user