You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.7 KiB
46 lines
1.7 KiB
6 years ago
|
[PATCH 2/6] e2fsprogs: fix endian handling of ext3_extent_header
|
||
|
|
|
||
|
|
This turned up when trying to resize a filesystem containing
|
||
|
|
a file with many extents on PPC64.
|
||
|
|
|
||
|
|
Fix all locations where ext3_extent_header members aren't
|
||
|
|
handled in an endian-safe manner.
|
||
|
|
|
||
|
|
(Note: inline data portion removed for rhel7 application)
|
||
|
|
|
||
|
|
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
|
||
|
|
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
|
||
|
|
---
|
||
|
|
lib/ext2fs/ext3_extents.h | 15 ++++++++++-----
|
||
|
|
2 files changed, 11 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/lib/ext2fs/ext3_extents.h b/lib/ext2fs/ext3_extents.h
|
||
|
|
index 4163436..a18d705 100644
|
||
|
|
--- a/lib/ext2fs/ext3_extents.h
|
||
|
|
+++ b/lib/ext2fs/ext3_extents.h
|
||
|
|
@@ -106,15 +106,20 @@ struct ext3_ext_path {
|
||
|
|
((struct ext3_extent_idx *) (((char *) (__hdr__)) + \
|
||
|
|
sizeof(struct ext3_extent_header)))
|
||
|
|
#define EXT_HAS_FREE_INDEX(__path__) \
|
||
|
|
- ((__path__)->p_hdr->eh_entries < (__path__)->p_hdr->eh_max)
|
||
|
|
+ (ext2fs_le16_to_cpu((__path__)->p_hdr->eh_entries) < \
|
||
|
|
+ ext2fs_le16_to_cpu((__path__)->p_hdr->eh_max))
|
||
|
|
#define EXT_LAST_EXTENT(__hdr__) \
|
||
|
|
- (EXT_FIRST_EXTENT((__hdr__)) + (__hdr__)->eh_entries - 1)
|
||
|
|
+ (EXT_FIRST_EXTENT((__hdr__)) + \
|
||
|
|
+ ext2fs_le16_to_cpu((__hdr__)->eh_entries) - 1)
|
||
|
|
#define EXT_LAST_INDEX(__hdr__) \
|
||
|
|
- (EXT_FIRST_INDEX((__hdr__)) + (__hdr__)->eh_entries - 1)
|
||
|
|
+ (EXT_FIRST_INDEX((__hdr__)) + \
|
||
|
|
+ ext2fs_le16_to_cpu((__hdr__)->eh_entries) - 1)
|
||
|
|
#define EXT_MAX_EXTENT(__hdr__) \
|
||
|
|
- (EXT_FIRST_EXTENT((__hdr__)) + (__hdr__)->eh_max - 1)
|
||
|
|
+ (EXT_FIRST_EXTENT((__hdr__)) + \
|
||
|
|
+ ext2fs_le16_to_cpu((__hdr__)->eh_max) - 1)
|
||
|
|
#define EXT_MAX_INDEX(__hdr__) \
|
||
|
|
- (EXT_FIRST_INDEX((__hdr__)) + (__hdr__)->eh_max - 1)
|
||
|
|
+ (EXT_FIRST_INDEX((__hdr__)) + \
|
||
|
|
+ ext2fs_le16_to_cpu((__hdr__)->eh_max) - 1)
|
||
|
|
|
||
|
|
#endif /* _LINUX_EXT3_EXTENTS */
|