@@ -198,7 +198,7 @@ static void print_extent_info(struct fiemap_extent *fm_extent, int cur_ex,
static int filefrag_fiemap(int fd, int blk_shift, int *num_extents,
ext2fs_struct_stat *st)
{
- char buf[16384];
+ __u64 buf[2048]; /* __u64 for proper field alignment */
struct fiemap *fiemap = (struct fiemap *)buf;
struct fiemap_extent *fm_ext = &fiemap->fm_extents[0];
int count = (sizeof(buf) - sizeof(*fiemap)) /
@@ -240,7 +240,7 @@ static int remove_journal_device(ext2_filsys fs)
{
char *journal_path;
ext2_filsys jfs;
- char buf[SUPERBLOCK_SIZE];
+ char buf[SUPERBLOCK_SIZE] __attribute__ ((aligned(8)));
journal_superblock_t *jsb;
int i, nr_users;
errcode_t retval;
@@ -2609,7 +2609,7 @@ fs_update_journal_user(struct ext2_super_block *sb, __u8 old_uuid[UUID_SIZE])
__u8 *j_uuid;
char *journal_path;
char uuid[UUID_STR_SIZE];
- char buf[SUPERBLOCK_SIZE];
+ char buf[SUPERBLOCK_SIZE] __attribute__ ((aligned(8)));
if (!(sb->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL) ||
uuid_is_null(sb->s_journal_uuid))
@@ -2964,7 +2964,7 @@ retry_open:
if (U_flag) {
int set_csum = 0;
dgrp_t i;
- char buf[SUPERBLOCK_SIZE];
+ char buf[SUPERBLOCK_SIZE] __attribute__ ((aligned(8)));
__u8 old_uuid[UUID_SIZE];
if (ext2fs_has_group_desc_csum(fs)) {
Some temporary char buffers allocated on the stack are not properly aligned when typecast to a structure containing __u32 or __u64 types, and this can cause alignment warnings on ARM and other alignment sensitive architectures, and potential slowdowns to do fixups. Fix the buffer alignment to avoid such issues. Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=680090 Reported-by: Gordan Bobic <gordan.bobic@gmail.com> Signed-off-by: Andreas Dilger <adilger@dilger.ca> --- misc/filefrag.c | 2 +- misc/tune2fs.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)