From: Amit Daniel Kachhap <amit.kachhap@arm.com> To: linux-kernel@vger.kernel.org Cc: Christoph Hellwig <hch@lst.de>, Vincenzo Frascino <Vincenzo.Frascino@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, linux-fsdevel <linux-fsdevel@vger.kernel.org>, kexec <kexec@lists.infradead.org>, Amit Daniel Kachhap <amit.kachhap@arm.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, x86 <x86@kernel.org> Subject: [RFC PATCH 05/14] x86/crash_dump_32: Use the new interface copy_oldmem_page_buf Date: Fri, 3 Dec 2021 16:12:22 +0530 [thread overview] Message-ID: <20211203104231.17597-6-amit.kachhap@arm.com> (raw) In-Reply-To: <20211203104231.17597-1-amit.kachhap@arm.com> The current interface copy_oldmem_page() passes user pointer without __user annotation and hence does unnecessary user/kernel pointer conversions during its implementation. Implement the interface copy_oldmem_page_buf() to avoid this issue. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: x86 <x86@kernel.org> Signed-off-by: Amit Daniel Kachhap <amit.kachhap@arm.com> --- arch/x86/kernel/crash_dump_32.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c index 5fcac46aaf6b..9932cd62ded1 100644 --- a/arch/x86/kernel/crash_dump_32.c +++ b/arch/x86/kernel/crash_dump_32.c @@ -30,20 +30,20 @@ static inline bool is_crashed_pfn_valid(unsigned long pfn) } /** - * copy_oldmem_page - copy one page from "oldmem" + * copy_oldmem_page_buf - copy one page from "oldmem" * @pfn: page frame number to be copied - * @buf: target memory address for the copy; this can be in kernel address - * space or user address space (see @userbuf) + * @ubuf: target user memory pointer for the copy; use copy_to_user() if this + * pointer is not NULL + * @kbuf: target kernel memory pointer for the copy; use memcpy() if this + * pointer is not NULL * @csize: number of bytes to copy * @offset: offset in bytes into the page (based on pfn) to begin the copy - * @userbuf: if set, @buf is in user address space, use copy_to_user(), - * otherwise @buf is in kernel address space, use memcpy(). * - * Copy a page from "oldmem". For this page, there might be no pte mapped - * in the current kernel. + * Copy a page from "oldmem" into the buffer pointed by either @ubuf or @kbuf. + * For this page, there might be no pte mapped in the current kernel. */ -ssize_t copy_oldmem_page(unsigned long pfn, char *buf, size_t csize, - unsigned long offset, int userbuf) +ssize_t copy_oldmem_page_buf(unsigned long pfn, char __user *ubuf, char *kbuf, + size_t csize, unsigned long offset) { void *vaddr; @@ -55,10 +55,10 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, size_t csize, vaddr = kmap_local_pfn(pfn); - if (!userbuf) { - memcpy(buf, vaddr + offset, csize); + if (!ubuf) { + memcpy(kbuf, vaddr + offset, csize); } else { - if (copy_to_user(buf, vaddr + offset, csize)) + if (copy_to_user(ubuf, vaddr + offset, csize)) csize = -EFAULT; } -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Amit Daniel Kachhap <amit.kachhap@arm.com> To: linux-kernel@vger.kernel.org Cc: Christoph Hellwig <hch@lst.de>, Vincenzo Frascino <Vincenzo.Frascino@arm.com>, Kevin Brodsky <kevin.brodsky@arm.com>, linux-fsdevel <linux-fsdevel@vger.kernel.org>, kexec <kexec@lists.infradead.org>, Amit Daniel Kachhap <amit.kachhap@arm.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>, Dave Hansen <dave.hansen@linux.intel.com>, x86 <x86@kernel.org> Subject: [RFC PATCH 05/14] x86/crash_dump_32: Use the new interface copy_oldmem_page_buf Date: Fri, 3 Dec 2021 16:12:22 +0530 [thread overview] Message-ID: <20211203104231.17597-6-amit.kachhap@arm.com> (raw) In-Reply-To: <20211203104231.17597-1-amit.kachhap@arm.com> The current interface copy_oldmem_page() passes user pointer without __user annotation and hence does unnecessary user/kernel pointer conversions during its implementation. Implement the interface copy_oldmem_page_buf() to avoid this issue. Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: x86 <x86@kernel.org> Signed-off-by: Amit Daniel Kachhap <amit.kachhap@arm.com> --- arch/x86/kernel/crash_dump_32.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/crash_dump_32.c b/arch/x86/kernel/crash_dump_32.c index 5fcac46aaf6b..9932cd62ded1 100644 --- a/arch/x86/kernel/crash_dump_32.c +++ b/arch/x86/kernel/crash_dump_32.c @@ -30,20 +30,20 @@ static inline bool is_crashed_pfn_valid(unsigned long pfn) } /** - * copy_oldmem_page - copy one page from "oldmem" + * copy_oldmem_page_buf - copy one page from "oldmem" * @pfn: page frame number to be copied - * @buf: target memory address for the copy; this can be in kernel address - * space or user address space (see @userbuf) + * @ubuf: target user memory pointer for the copy; use copy_to_user() if this + * pointer is not NULL + * @kbuf: target kernel memory pointer for the copy; use memcpy() if this + * pointer is not NULL * @csize: number of bytes to copy * @offset: offset in bytes into the page (based on pfn) to begin the copy - * @userbuf: if set, @buf is in user address space, use copy_to_user(), - * otherwise @buf is in kernel address space, use memcpy(). * - * Copy a page from "oldmem". For this page, there might be no pte mapped - * in the current kernel. + * Copy a page from "oldmem" into the buffer pointed by either @ubuf or @kbuf. + * For this page, there might be no pte mapped in the current kernel. */ -ssize_t copy_oldmem_page(unsigned long pfn, char *buf, size_t csize, - unsigned long offset, int userbuf) +ssize_t copy_oldmem_page_buf(unsigned long pfn, char __user *ubuf, char *kbuf, + size_t csize, unsigned long offset) { void *vaddr; @@ -55,10 +55,10 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, size_t csize, vaddr = kmap_local_pfn(pfn); - if (!userbuf) { - memcpy(buf, vaddr + offset, csize); + if (!ubuf) { + memcpy(kbuf, vaddr + offset, csize); } else { - if (copy_to_user(buf, vaddr + offset, csize)) + if (copy_to_user(ubuf, vaddr + offset, csize)) csize = -EFAULT; } -- 2.17.1 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2021-12-03 10:43 UTC|newest] Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-03 10:42 [RFC PATCH 00/14] fs/proc/vmcore: Remove unnecessary user pointer conversions Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 01/14] fs/proc/vmcore: Update read_from_oldmem() for user pointer Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-06 14:04 ` Christoph Hellwig 2021-12-06 14:04 ` Christoph Hellwig 2021-12-06 14:17 ` Matthew Wilcox 2021-12-06 14:17 ` Matthew Wilcox 2021-12-06 14:54 ` Christoph Hellwig 2021-12-06 14:54 ` Christoph Hellwig 2021-12-06 15:07 ` Matthew Wilcox 2021-12-06 15:07 ` Matthew Wilcox 2021-12-07 11:15 ` Christoph Hellwig 2021-12-07 11:15 ` Christoph Hellwig 2021-12-07 7:11 ` Amit Kachhap 2021-12-07 7:11 ` Amit Kachhap 2021-12-03 10:42 ` [RFC PATCH 02/14] fs/proc/vmcore: Update copy_oldmem_page_encrypted() for user buffer Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 03/14] fs/proc/vmcore: Update copy_oldmem_page() " Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 04/14] x86/crash_dump_64: Use the new interface copy_oldmem_page_buf Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap [this message] 2021-12-03 10:42 ` [RFC PATCH 05/14] x86/crash_dump_32: " Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 06/14] arm64/crash_dump: " Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 07/14] arm/crash_dump: " Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 08/14] mips/crash_dump: " Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 09/14] sh/crash_dump: " Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 10/14] riscv/crash_dump: " Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 11/14] powerpc/crash_dump: " Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 12/14] ia64/crash_dump: " Amit Daniel Kachhap 2021-12-03 10:54 ` Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 13/14] s390/crash_dump: " Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap 2021-12-03 10:42 ` [RFC PATCH 14/14] fs/proc/vmcore: Remove the unused old interface copy_oldmem_page Amit Daniel Kachhap 2021-12-03 10:42 ` Amit Daniel Kachhap
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211203104231.17597-6-amit.kachhap@arm.com \ --to=amit.kachhap@arm.com \ --cc=Vincenzo.Frascino@arm.com \ --cc=bp@alien8.de \ --cc=dave.hansen@linux.intel.com \ --cc=hch@lst.de \ --cc=kevin.brodsky@arm.com \ --cc=kexec@lists.infradead.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.