[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1486322541-8206-196-git-send-email-w@1wt.eu>
Date: Sun, 5 Feb 2017 20:21:57 +0100
From: Willy Tarreau <w@....eu>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org,
linux@...ck-us.net
Cc: Andrew Bresticker <abrestic@...omium.org>,
Enric Balletbo Serra <enric.balletbo@...labora.com>,
Kees Cook <keescook@...omium.org>, Willy Tarreau <w@....eu>
Subject: [PATCH 3.10 295/319] pstore/ram: Use memcpy_fromio() to save old buffer
From: Andrew Bresticker <abrestic@...omium.org>
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@...omium.org>
Signed-off-by: Enric Balletbo Serra <enric.balletbo@...labora.com>
Reviewed-by: Puneet Kumar <puneetster@...omium.org>
Signed-off-by: Kees Cook <keescook@...omium.org>
Signed-off-by: Willy Tarreau <w@....eu>
---
fs/pstore/ram_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c
index eb42483..7df456d 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,
--
2.8.0.rc2.1.gbe9624a
Powered by blists - more mailing lists