redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

pstore/ram: Use memcpy_fromio() to save old buffer

Browse source 
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>
Cc: stable@vger.kernel.org
This commit is contained in:
Andrew Bresticker 2016-02-15 09:19:49 +01:00 committed by Kees Cook
parent 7e75678d23
commit d771fdf941
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/pstore/ram_core.c
View file

@ -297,8 +297,8 @@ void persistent_ram_save_old(struct persistent_ram_zone *prz)
} }
prz->old_log_size = size; prz->old_log_size = size;
memcpy(prz->old_log, &buffer->data[start], size - start); memcpy_fromio(prz->old_log, &buffer->data[start], size - start);
memcpy(prz->old_log + size - start, &buffer->data[0], start); memcpy_fromio(prz->old_log + size - start, &buffer->data[0], start);
} }
int notrace persistent_ram_write(struct persistent_ram_zone *prz, int notrace persistent_ram_write(struct persistent_ram_zone *prz,