diff options
| author | Furquan Shaikh <furquan@google.com> | 2016-02-15 09:19:48 +0100 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2016-09-08 15:01:11 -0700 |
| commit | 7e75678d23167c2527e655658a8ef36a36c8b4d9 (patch) | |
| tree | 8f3e5a57d80de41ffb9a483364a8163edfb177be /fs | |
| parent | 5bf6d1b92715f224ef6e1c3abca5dd63eeb4915d (diff) | |
| download | linux-rpi-7e75678d23167c2527e655658a8ef36a36c8b4d9.tar.gz linux-rpi-7e75678d23167c2527e655658a8ef36a36c8b4d9.tar.bz2 linux-rpi-7e75678d23167c2527e655658a8ef36a36c8b4d9.zip | |
pstore/ram: Use memcpy_toio instead of memcpy
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>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs')
| -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 9486c4873c69..b40282768c3f 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c @@ -264,7 +264,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); } |