RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

pkg/littlefs: fix unaligned memory access

Browse Source 
Previously `tests/pkg_littlefs` crashed on the `samr21-xpro`. This
now aligns the buffers in `littlefs_desc_t` to the alignment
requirement of `uint32_t`.

Specifically the issue causing the crash at hand was that
`lfs_free_t::buffer` is of type `uint32_t *`, so access are expected
to be aligned to `uint32_t`. After this commit, this assumption is
fulfilled.
This commit is contained in:
Marian Buschsieweke 2022-08-18 18:29:23 +02:00
parent 2dd59236c8
commit f87a401c87
No known key found for this signature in database
GPG Key ID: CB8E3238CE715A94
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/include/fs/littlefs_fs.h
View File

@ -22,15 +22,18 @@
#ifndef FS_LITTLEFS_FS_H
#define FS_LITTLEFS_FS_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdalign.h>
#include "vfs.h"
#include "lfs.h"
#include "mtd.h"
#include "mutex.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* @name littlefs configuration
* @{
@ -79,21 +82,21 @@ typedef struct {
* total number of block is defined in @p config.
* if set to 0, the total number of sectors from the mtd is used */
uint32_t base_addr;
uint16_t sectors_per_block; /**< number of sectors per block */
#if LITTLEFS_FILE_BUFFER_SIZE || DOXYGEN
/** file buffer to use internally if LITTLEFS_FILE_BUFFER_SIZE is set */
uint8_t file_buf[LITTLEFS_FILE_BUFFER_SIZE];
alignas(uint32_t) uint8_t file_buf[LITTLEFS_FILE_BUFFER_SIZE];
#endif
#if LITTLEFS_READ_BUFFER_SIZE || DOXYGEN
/** read buffer to use internally if LITTLEFS_READ_BUFFER_SIZE is set */
uint8_t read_buf[LITTLEFS_READ_BUFFER_SIZE];
alignas(uint32_t) uint8_t read_buf[LITTLEFS_READ_BUFFER_SIZE];
#endif
#if LITTLEFS_PROG_BUFFER_SIZE || DOXYGEN
/** prog buffer to use internally if LITTLEFS_PROG_BUFFER_SIZE is set */
uint8_t prog_buf[LITTLEFS_PROG_BUFFER_SIZE];
alignas(uint32_t) uint8_t prog_buf[LITTLEFS_PROG_BUFFER_SIZE];
#endif
/** lookahead buffer to use internally */
uint8_t lookahead_buf[LITTLEFS_LOOKAHEAD_SIZE / 8];
alignas(uint32_t) uint8_t lookahead_buf[LITTLEFS_LOOKAHEAD_SIZE / 8];
uint16_t sectors_per_block; /**< number of sectors per block */
} littlefs_desc_t;
/** The littlefs vfs driver */