summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2018-10-08 10:05:20 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-24 08:20:45 +0100
commit94764e3ae569573903af9ea8201073eb96cb4d64 (patch)
tree4d3593f5de7f56d9ca9fbad9d9c94797b8d5e05d /fs/proc
parente78c55ad66571aa6803478b3f4b6379dc18cc137 (diff)
downloadlinux-stable-94764e3ae569573903af9ea8201073eb96cb4d64.tar.gz
linux-stable-94764e3ae569573903af9ea8201073eb96cb4d64.tar.bz2
linux-stable-94764e3ae569573903af9ea8201073eb96cb4d64.zip
proc/vmcore: Fix i386 build error of missing copy_oldmem_page_encrypted()
[ Upstream commit cf089611f4c446285046fcd426d90c18f37d2905 ] Lianbo reported a build error with a particular 32-bit config, see Link below for details. Provide a weak copy_oldmem_page_encrypted() function which architectures can override, in the same manner other functionality in that file is supplied. Reported-by: Lianbo Jiang <lijiang@redhat.com> Signed-off-by: Borislav Petkov <bp@suse.de> CC: x86@kernel.org Link: http://lkml.kernel.org/r/710b9d95-2f70-eadf-c4a1-c3dc80ee4ebb@redhat.com Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/vmcore.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index cbde728f8ac6..5c5f161763c8 100644
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -177,6 +177,16 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
}
/*
+ * Architectures which support memory encryption override this.
+ */
+ssize_t __weak
+copy_oldmem_page_encrypted(unsigned long pfn, char *buf, size_t csize,
+ unsigned long offset, int userbuf)
+{
+ return copy_oldmem_page(pfn, buf, csize, offset, userbuf);
+}
+
+/*
* Copy to either kernel or user space
*/
static int copy_to(void *target, void *src, size_t size, int userbuf)