diff options
| author | Andrew Bresticker <abrestic@chromium.org> | 2016-02-15 09:19:49 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-02-10 11:04:02 +0100 |
| commit | 8996ef00ef17c7e8460bca5785c5f08794d9f589 (patch) | |
| tree | 4fbd50c74a8d7e2a87aee26a97124f26db710737 | |
| parent | 0d29b98a434751a1b7c654d4e437883f3f27fe51 (diff) | |
| download | linux-stable-8996ef00ef17c7e8460bca5785c5f08794d9f589.tar.gz linux-stable-8996ef00ef17c7e8460bca5785c5f08794d9f589.tar.bz2 linux-stable-8996ef00ef17c7e8460bca5785c5f08794d9f589.zip | |
pstore/ram: Use memcpy_fromio() to save old buffer
commit d771fdf94180de2bd811ac90cba75f0f346abf8d upstream.
The ramoops buffer may be mapped as either I/O memory or uncached
memory. On ARM64, this results in a device-type (strongly-ordered)
mapping. Since unnaligned accesses to device-type memory will
generate an alignment fault (regardless of whether or not strict
alignment checking is enabled), it is not safe to use memcpy().
memcpy_fromio() is guaranteed to only use aligned accesses, so use
that instead.
Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Signed-off-by: Enric Balletbo Serra <enric.balletbo@collabora.com>
Reviewed-by: Puneet Kumar <puneetster@chromium.org>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -rw-r--r-- | fs/pstore/ram_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c index eb42483dbb05..7df456db7c33 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c @@ -286,8 +286,8 @@ void persistent_ram_save_old(struct persistent_ram_zone *prz) } prz->old_log_size = size; - memcpy(prz->old_log, &buffer->data[start], size - start); - memcpy(prz->old_log + size - start, &buffer->data[0], start); + memcpy_fromio(prz->old_log, &buffer->data[start], size - start); + memcpy_fromio(prz->old_log + size - start, &buffer->data[0], start); } int notrace persistent_ram_write(struct persistent_ram_zone *prz, |