diff options
| author | Andrew Bresticker <abrestic@chromium.org> | 2016-02-15 09:19:49 +0100 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2016-09-08 15:01:12 -0700 |
| commit | d771fdf94180de2bd811ac90cba75f0f346abf8d (patch) | |
| tree | 35ed27e1a7667a2e651b6f29c4754bc582547ae2 /fs/pstore | |
| parent | 7e75678d23167c2527e655658a8ef36a36c8b4d9 (diff) | |
| download | op-kernel-dev-d771fdf94180de2bd811ac90cba75f0f346abf8d.zip op-kernel-dev-d771fdf94180de2bd811ac90cba75f0f346abf8d.tar.gz | |
pstore/ram: Use memcpy_fromio() to save old buffer
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
Diffstat (limited to 'fs/pstore')
| -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 b402827..3975dee 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c @@ -297,8 +297,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, |
