leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fs: btrfs: Fix unaligned memory accesses

Browse Source 
Loading files stored with lzo compression from a btrfs filesystem was
producing unaligned memory accesses, which were causing a data abort
and a reset on an Orange Pi Zero.

The change in hash.c is not triggered by any error but follows the
same pattern. Please confirm.

Fixed according to doc/README.unaligned-memory-access.txt

Signed-off-by: Alberto Sánchez Molero <alsamolero@gmail.com>
Tested-by: Robert Nelson <robertcnelson@gmail.com>
This commit is contained in:
Alberto Sánchez Molero 2018-01-20 09:17:57 +02:00 committed by Tom Rini
parent 990dba6498
commit 2021f083ed
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/btrfs/compression.c
View File

@ -9,6 +9,7 @@
#include "btrfs.h" #include "btrfs.h"
#include <linux/lzo.h> #include <linux/lzo.h>
#include <u-boot/zlib.h> #include <u-boot/zlib.h>
#include <asm/unaligned.h>
static u32 decompress_lzo(const u8 *cbuf, u32 clen, u8 *dbuf, u32 dlen) static u32 decompress_lzo(const u8 *cbuf, u32 clen, u8 *dbuf, u32 dlen)
{ {
@ -19,7 +20,7 @@ static u32 decompress_lzo(const u8 *cbuf, u32 clen, u8 *dbuf, u32 dlen)
if (clen < 4) if (clen < 4)
return -1; return -1;
tot_len = le32_to_cpu(*(u32 *) cbuf); tot_len = le32_to_cpu(get_unaligned((u32 *)cbuf));
cbuf += 4; cbuf += 4;
clen -= 4; clen -= 4;
tot_len -= 4; tot_len -= 4;
@ -32,7 +33,7 @@ static u32 decompress_lzo(const u8 *cbuf, u32 clen, u8 *dbuf, u32 dlen)
res = 0; res = 0;
while (tot_len > 4) { while (tot_len > 4) {
in_len = le32_to_cpu(*(u32 *) cbuf); in_len = le32_to_cpu(get_unaligned((u32 *)cbuf));
cbuf += 4; cbuf += 4;
clen -= 4; clen -= 4;

3
fs/btrfs/hash.c
View File

@ -8,6 +8,7 @@
#include "btrfs.h" #include "btrfs.h"
#include <u-boot/crc.h> #include <u-boot/crc.h>
#include <asm/unaligned.h>
static u32 btrfs_crc32c_table[256]; static u32 btrfs_crc32c_table[256];
@ -34,5 +35,5 @@ u32 btrfs_csum_data(char *data, u32 seed, size_t len)
void btrfs_csum_final(u32 crc, void *result) void btrfs_csum_final(u32 crc, void *result)
{ {
*((u32 *) result) = cpu_to_le32(~crc); put_unaligned(cpu_to_le32(~crc), (u32 *)result);
} }