path: root/fs/fat/fat.c
diff options
authorBryan Wu <>2009-01-02 20:47:45 -0500
committerWolfgang Denk <>2009-01-24 02:03:39 +0100
commit7e4b9b4f6f43838fad3ad72c029a3d7fc7c7d48c (patch)
tree15e3bff16bca717affc4631f8b4e513e2c57765e /fs/fat/fat.c
parent68f8718df2ed4c2f43031407ccf6cfa81125dddc (diff)
fat: fix unaligned errors
A couple of buffers in the fat code are declared as an array of bytes. But it is then cast up to a structure with 16bit and 32bit members. Since GCC assumes structure alignment here, we have to force the buffers to be aligned according to the structure usage. Signed-off-by: Bryan Wu <> Signed-off-by: Mike Frysinger <>
Diffstat (limited to 'fs/fat/fat.c')
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index a9dde7defe..28c7805d0d 100644
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -434,7 +434,8 @@ slot2str(dir_slot *slotptr, char *l_name, int *idx)
* into 'retdent'
* Return 0 on success, -1 otherwise.
-__u8 get_vfatname_block[MAX_CLUSTSIZE];
+__attribute__ ((__aligned__(__alignof__(dir_entry))))
+__u8 get_vfatname_block[MAX_CLUSTSIZE];
static int
get_vfatname(fsdata *mydata, int curclust, __u8 *cluster,
dir_entry *retdent, char *l_name)
@@ -520,6 +521,7 @@ mkcksum(const char *str)
* Get the directory entry associated with 'filename' from the directory
* starting at 'startsect'
+__attribute__ ((__aligned__(__alignof__(dir_entry))))
__u8 get_dentfromdir_block[MAX_CLUSTSIZE];
static dir_entry *get_dentfromdir (fsdata * mydata, int startsect,
char *filename, dir_entry * retdent,
@@ -725,8 +727,8 @@ read_bootsectandvi(boot_sector *bs, volume_info *volinfo, int *fatsize)
return -1;
-__u8 do_fat_read_block[MAX_CLUSTSIZE]; /* Block buffer */
+__attribute__ ((__aligned__(__alignof__(dir_entry))))
+__u8 do_fat_read_block[MAX_CLUSTSIZE];
do_fat_read (const char *filename, void *buffer, unsigned long maxsize,
int dols)
OpenPOWER on IntegriCloud