diff options
| author | Furquan Shaikh <furquan@google.com> | 2016-02-15 09:19:48 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-02-10 11:04:01 +0100 |
| commit | 0d29b98a434751a1b7c654d4e437883f3f27fe51 (patch) | |
| tree | 3f01665468245910febfcfa0e79aac7e85b20847 | |
| parent | 90efe9d4773eedf96d9e4ebb0193da7c6f09ca52 (diff) | |
| download | linux-stable-0d29b98a434751a1b7c654d4e437883f3f27fe51.tar.gz linux-stable-0d29b98a434751a1b7c654d4e437883f3f27fe51.tar.bz2 linux-stable-0d29b98a434751a1b7c654d4e437883f3f27fe51.zip | |
pstore/ram: Use memcpy_toio instead of memcpy
commit 7e75678d23167c2527e655658a8ef36a36c8b4d9 upstream.
persistent_ram_update uses vmap / iomap based on whether the buffer is in
memory region or reserved region. However, both map it as non-cacheable
memory. For armv8 specifically, non-cacheable mapping requests use a
memory type that has to be accessed aligned to the request size. memcpy()
doesn't guarantee that.
Signed-off-by: Furquan Shaikh <furquan@google.com>
Signed-off-by: Enric Balletbo Serra <enric.balletbo@collabora.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Olof Johansson <olofj@chromium.org>
Tested-by: Furquan Shaikh <furquan@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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c index ee3c6ec5348f..eb42483dbb05 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c @@ -263,7 +263,7 @@ static void notrace persistent_ram_update(struct persistent_ram_zone *prz, const void *s, unsigned int start, unsigned int count) { struct persistent_ram_buffer *buffer = prz->buffer; - memcpy(buffer->data + start, s, count); + memcpy_toio(buffer->data + start, s, count); persistent_ram_update_ecc(prz, start, count); } |