fs/fat: Fix unaligned __u16 reads for FAT12 access

Doing unaligned reads is not supported on all architectures, use
byte sized reads of the little endian buffer.
Rename off16 to off8, as it reflects the buffer offset in byte
granularity (offset is in entry, i.e. 12 bit, granularity).
Fix a regression introduced in bba703a5b508c786bf37f90fd238f23cea781a66

Reported-by: Oleksandr Tymoshenko <gonzo@bluezbox.com>
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Tested-by: Oleksandr Tymoshenko <gonzo@bluezbox.com>

diff --git a/fs/fat/fat.c b/fs/fat/fat.c
index 244ee091917fa01e8e7b9a61fc2ab51b92fbe90f..56540031d6de78b2541034bed2a90214ea81e68d 100644 (file)
--- a/fs/fat/fat.c
+++ b/fs/fat/fat.c
@@ -179,7 +179,7 @@ int flush_dirty_fat_buffer(fsdata *mydata)
 static __u32 get_fatent(fsdata *mydata, __u32 entry)
 {
        __u32 bufnum;
-       __u32 off16, offset;
+       __u32 offset, off8;
        __u32 ret = 0x00;
 
        if (CHECK_CLUST(entry, mydata->fatsize)) {
@@ -242,8 +242,9 @@ static __u32 get_fatent(fsdata *mydata, __u32 entry)
                ret = FAT2CPU16(((__u16 *) mydata->fatbuf)[offset]);
                break;
        case 12:
-               off16 = (offset * 3) / 2;
-               ret = FAT2CPU16(*(__u16 *)(mydata->fatbuf + off16));
+               off8 = (offset * 3) / 2;
+               /* fatbut + off8 may be unaligned, read in byte granularity */
+               ret = mydata->fatbuf[off8] + (mydata->fatbuf[off8 + 1] << 8);
 
                if (offset & 0x1)
                        ret >>= 4;