diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-25 10:37:35 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-25 10:38:47 +0200 |
| commit | 772cc850aeff668d74c2201f33c242e8bd108967 (patch) | |
| tree | bad0ba0ee311cb8c0762eee375864d6395f79a9e | |
| parent | 07f0462a457729f7e1eba6396c8fb4bea9cf46a2 (diff) | |
| download | barebox-772cc850aeff668d74c2201f33c242e8bd108967.tar.gz barebox-772cc850aeff668d74c2201f33c242e8bd108967.tar.xz | |
fs: ext4: le32_to_cpu() used on a 16-bit field
From U-Boot commit:
| commit 8b415f703f88d1d3b0466830047affbbf7f24913
| Author: Rommel Custodio <sessyargc+uboot@gmail.com>
| Date: Sun Jul 21 10:53:25 2013 +0200
|
| ext4fs: le32_to_cpu() used on a 16-bit field
|
| Fix reading ext4_extent_header struture on BE machines. Some 16 bit
| fields where converted to 32 bit fields, due to the byte swap on BE
| machines the containing value was corrupted. Therefore reading ext4
| filesystems on BE machines where broken before.
|
| Signed-off-by: Rommel Custodio <sessyargc+uboot@gmail.com>
| [sent via git-send-email; rework commit message]
| Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
| Reviewed-by: Simon Glass <sjg@chromium.org>
| Tested-by: Simon Glass <sjg@chromium.org>
| Tested-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | fs/ext4/ext4_common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 1bd9215190..ab0e6b5fbc 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -51,7 +51,7 @@ static struct ext4_extent_header *ext4fs_get_extent_block(struct ext2_data *data while (1) { index = (struct ext4_extent_idx *)(ext_block + 1); - if (le32_to_cpu(ext_block->eh_magic) != EXT4_EXT_MAGIC) + if (le16_to_cpu(ext_block->eh_magic) != EXT4_EXT_MAGIC) return 0; if (ext_block->eh_depth == 0) @@ -59,14 +59,14 @@ static struct ext4_extent_header *ext4fs_get_extent_block(struct ext2_data *data i = -1; do { i++; - if (i >= le32_to_cpu(ext_block->eh_entries)) + if (i >= le16_to_cpu(ext_block->eh_entries)) break; } while (fileblock >= le32_to_cpu(index[i].ei_block)); if (--i < 0) return 0; - block = le32_to_cpu(index[i].ei_leaf_hi); + block = le16_to_cpu(index[i].ei_leaf_hi); block = (block << 32) + le32_to_cpu(index[i].ei_leaf_lo); ret = ext4fs_devread(fs, block << log2_blksz, 0, blksz, buf); @@ -187,18 +187,18 @@ long int read_allocated_block(struct ext2fs_node *node, int fileblock) do { i++; - if (i >= le32_to_cpu(ext_block->eh_entries)) + if (i >= le16_to_cpu(ext_block->eh_entries)) break; } while (fileblock >= le32_to_cpu(extent[i].ee_block)); if (--i >= 0) { fileblock -= le32_to_cpu(extent[i].ee_block); - if (fileblock >= le32_to_cpu(extent[i].ee_len)) { + if (fileblock >= le16_to_cpu(extent[i].ee_len)) { free(buf); return 0; } - start = le32_to_cpu(extent[i].ee_start_hi); + start = le16_to_cpu(extent[i].ee_start_hi); start = (start << 32) + le32_to_cpu(extent[i].ee_start_lo); free(buf); |