| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <b4eba1ab-2659-53a8-d7dd-c4715e64fe36@c-s.fr>
Date: Fri, 30 Aug 2019 22:22:39 +0200
From: Christophe Leroy <christophe.leroy@....fr>
To: Michal Suchanek <msuchanek@...e.de>, linuxppc-dev@...ts.ozlabs.org
Cc: Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
Michael Ellerman <mpe@...erman.id.au>,
Nicholas Piggin <npiggin@...il.com>,
Hari Bathini <hbathini@...ux.ibm.com>,
Joel Stanley <joel@....id.au>,
Andrew Donnellan <andrew.donnellan@....ibm.com>,
Firoz Khan <firoz.khan@...aro.org>,
Breno Leitao <leitao@...ian.org>,
Russell Currey <ruscur@...sell.cc>,
Nicolai Stange <nstange@...e.de>,
Michael Neuling <mikey@...ling.org>,
"Eric W. Biederman" <ebiederm@...ssion.com>,
Thomas Gleixner <tglx@...utronix.de>,
Arnd Bergmann <arnd@...db.de>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
Heiko Carstens <heiko.carstens@...ibm.com>,
Christian Brauner <christian@...uner.io>,
David Howells <dhowells@...hat.com>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Allison Randal <allison@...utok.net>,
David Hildenbrand <david@...hat.com>,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH v6 2/6] powerpc: move common register copy functions from
signal_32.c to signal.c
Le 30/08/2019 à 20:57, Michal Suchanek a écrit :
> These functions are required for 64bit as well.
>
> Signed-off-by: Michal Suchanek <msuchanek@...e.de>
Reviewed-by: christophe.leroy@....fr
> ---
> arch/powerpc/kernel/signal.c | 141 ++++++++++++++++++++++++++++++++
> arch/powerpc/kernel/signal_32.c | 140 -------------------------------
> 2 files changed, 141 insertions(+), 140 deletions(-)
>
> diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
> index e6c30cee6abf..60436432399f 100644
> --- a/arch/powerpc/kernel/signal.c
> +++ b/arch/powerpc/kernel/signal.c
> @@ -18,12 +18,153 @@
> #include <linux/syscalls.h>
> #include <asm/hw_breakpoint.h>
> #include <linux/uaccess.h>
> +#include <asm/switch_to.h>
> #include <asm/unistd.h>
> #include <asm/debug.h>
> #include <asm/tm.h>
>
> #include "signal.h"
>
> +#ifdef CONFIG_VSX
> +unsigned long copy_fpr_to_user(void __user *to,
> + struct task_struct *task)
> +{
> + u64 buf[ELF_NFPREG];
> + int i;
> +
> + /* save FPR copy to local buffer then write to the thread_struct */
> + for (i = 0; i < (ELF_NFPREG - 1) ; i++)
> + buf[i] = task->thread.TS_FPR(i);
> + buf[i] = task->thread.fp_state.fpscr;
> + return __copy_to_user(to, buf, ELF_NFPREG * sizeof(double));
> +}
> +
> +unsigned long copy_fpr_from_user(struct task_struct *task,
> + void __user *from)
> +{
> + u64 buf[ELF_NFPREG];
> + int i;
> +
> + if (__copy_from_user(buf, from, ELF_NFPREG * sizeof(double)))
> + return 1;
> + for (i = 0; i < (ELF_NFPREG - 1) ; i++)
> + task->thread.TS_FPR(i) = buf[i];
> + task->thread.fp_state.fpscr = buf[i];
> +
> + return 0;
> +}
> +
> +unsigned long copy_vsx_to_user(void __user *to,
> + struct task_struct *task)
> +{
> + u64 buf[ELF_NVSRHALFREG];
> + int i;
> +
> + /* save FPR copy to local buffer then write to the thread_struct */
> + for (i = 0; i < ELF_NVSRHALFREG; i++)
> + buf[i] = task->thread.fp_state.fpr[i][TS_VSRLOWOFFSET];
> + return __copy_to_user(to, buf, ELF_NVSRHALFREG * sizeof(double));
> +}
> +
> +unsigned long copy_vsx_from_user(struct task_struct *task,
> + void __user *from)
> +{
> + u64 buf[ELF_NVSRHALFREG];
> + int i;
> +
> + if (__copy_from_user(buf, from, ELF_NVSRHALFREG * sizeof(double)))
> + return 1;
> + for (i = 0; i < ELF_NVSRHALFREG ; i++)
> + task->thread.fp_state.fpr[i][TS_VSRLOWOFFSET] = buf[i];
> + return 0;
> +}
> +
> +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
> +unsigned long copy_ckfpr_to_user(void __user *to,
> + struct task_struct *task)
> +{
> + u64 buf[ELF_NFPREG];
> + int i;
> +
> + /* save FPR copy to local buffer then write to the thread_struct */
> + for (i = 0; i < (ELF_NFPREG - 1) ; i++)
> + buf[i] = task->thread.TS_CKFPR(i);
> + buf[i] = task->thread.ckfp_state.fpscr;
> + return __copy_to_user(to, buf, ELF_NFPREG * sizeof(double));
> +}
> +
> +unsigned long copy_ckfpr_from_user(struct task_struct *task,
> + void __user *from)
> +{
> + u64 buf[ELF_NFPREG];
> + int i;
> +
> + if (__copy_from_user(buf, from, ELF_NFPREG * sizeof(double)))
> + return 1;
> + for (i = 0; i < (ELF_NFPREG - 1) ; i++)
> + task->thread.TS_CKFPR(i) = buf[i];
> + task->thread.ckfp_state.fpscr = buf[i];
> +
> + return 0;
> +}
> +
> +unsigned long copy_ckvsx_to_user(void __user *to,
> + struct task_struct *task)
> +{
> + u64 buf[ELF_NVSRHALFREG];
> + int i;
> +
> + /* save FPR copy to local buffer then write to the thread_struct */
> + for (i = 0; i < ELF_NVSRHALFREG; i++)
> + buf[i] = task->thread.ckfp_state.fpr[i][TS_VSRLOWOFFSET];
> + return __copy_to_user(to, buf, ELF_NVSRHALFREG * sizeof(double));
> +}
> +
> +unsigned long copy_ckvsx_from_user(struct task_struct *task,
> + void __user *from)
> +{
> + u64 buf[ELF_NVSRHALFREG];
> + int i;
> +
> + if (__copy_from_user(buf, from, ELF_NVSRHALFREG * sizeof(double)))
> + return 1;
> + for (i = 0; i < ELF_NVSRHALFREG ; i++)
> + task->thread.ckfp_state.fpr[i][TS_VSRLOWOFFSET] = buf[i];
> + return 0;
> +}
> +#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
> +#else
> +inline unsigned long copy_fpr_to_user(void __user *to,
> + struct task_struct *task)
> +{
> + return __copy_to_user(to, task->thread.fp_state.fpr,
> + ELF_NFPREG * sizeof(double));
> +}
> +
> +inline unsigned long copy_fpr_from_user(struct task_struct *task,
> + void __user *from)
> +{
> + return __copy_from_user(task->thread.fp_state.fpr, from,
> + ELF_NFPREG * sizeof(double));
> +}
> +
> +#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
> +inline unsigned long copy_ckfpr_to_user(void __user *to,
> + struct task_struct *task)
> +{
> + return __copy_to_user(to, task->thread.ckfp_state.fpr,
> + ELF_NFPREG * sizeof(double));
> +}
> +
> +inline unsigned long copy_ckfpr_from_user(struct task_struct *task,
> + void __user *from)
> +{
> + return __copy_from_user(task->thread.ckfp_state.fpr, from,
> + ELF_NFPREG * sizeof(double));
> +}
> +#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
> +#endif
> +
> /* Log an error when sending an unhandled signal to a process. Controlled
> * through debug.exception-trace sysctl.
> */
> diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
> index 98600b276f76..c93c937ea568 100644
> --- a/arch/powerpc/kernel/signal_32.c
> +++ b/arch/powerpc/kernel/signal_32.c
> @@ -235,146 +235,6 @@ struct rt_sigframe {
> int abigap[56];
> };
>
> -#ifdef CONFIG_VSX
> -unsigned long copy_fpr_to_user(void __user *to,
> - struct task_struct *task)
> -{
> - u64 buf[ELF_NFPREG];
> - int i;
> -
> - /* save FPR copy to local buffer then write to the thread_struct */
> - for (i = 0; i < (ELF_NFPREG - 1) ; i++)
> - buf[i] = task->thread.TS_FPR(i);
> - buf[i] = task->thread.fp_state.fpscr;
> - return __copy_to_user(to, buf, ELF_NFPREG * sizeof(double));
> -}
> -
> -unsigned long copy_fpr_from_user(struct task_struct *task,
> - void __user *from)
> -{
> - u64 buf[ELF_NFPREG];
> - int i;
> -
> - if (__copy_from_user(buf, from, ELF_NFPREG * sizeof(double)))
> - return 1;
> - for (i = 0; i < (ELF_NFPREG - 1) ; i++)
> - task->thread.TS_FPR(i) = buf[i];
> - task->thread.fp_state.fpscr = buf[i];
> -
> - return 0;
> -}
> -
> -unsigned long copy_vsx_to_user(void __user *to,
> - struct task_struct *task)
> -{
> - u64 buf[ELF_NVSRHALFREG];
> - int i;
> -
> - /* save FPR copy to local buffer then write to the thread_struct */
> - for (i = 0; i < ELF_NVSRHALFREG; i++)
> - buf[i] = task->thread.fp_state.fpr[i][TS_VSRLOWOFFSET];
> - return __copy_to_user(to, buf, ELF_NVSRHALFREG * sizeof(double));
> -}
> -
> -unsigned long copy_vsx_from_user(struct task_struct *task,
> - void __user *from)
> -{
> - u64 buf[ELF_NVSRHALFREG];
> - int i;
> -
> - if (__copy_from_user(buf, from, ELF_NVSRHALFREG * sizeof(double)))
> - return 1;
> - for (i = 0; i < ELF_NVSRHALFREG ; i++)
> - task->thread.fp_state.fpr[i][TS_VSRLOWOFFSET] = buf[i];
> - return 0;
> -}
> -
> -#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
> -unsigned long copy_ckfpr_to_user(void __user *to,
> - struct task_struct *task)
> -{
> - u64 buf[ELF_NFPREG];
> - int i;
> -
> - /* save FPR copy to local buffer then write to the thread_struct */
> - for (i = 0; i < (ELF_NFPREG - 1) ; i++)
> - buf[i] = task->thread.TS_CKFPR(i);
> - buf[i] = task->thread.ckfp_state.fpscr;
> - return __copy_to_user(to, buf, ELF_NFPREG * sizeof(double));
> -}
> -
> -unsigned long copy_ckfpr_from_user(struct task_struct *task,
> - void __user *from)
> -{
> - u64 buf[ELF_NFPREG];
> - int i;
> -
> - if (__copy_from_user(buf, from, ELF_NFPREG * sizeof(double)))
> - return 1;
> - for (i = 0; i < (ELF_NFPREG - 1) ; i++)
> - task->thread.TS_CKFPR(i) = buf[i];
> - task->thread.ckfp_state.fpscr = buf[i];
> -
> - return 0;
> -}
> -
> -unsigned long copy_ckvsx_to_user(void __user *to,
> - struct task_struct *task)
> -{
> - u64 buf[ELF_NVSRHALFREG];
> - int i;
> -
> - /* save FPR copy to local buffer then write to the thread_struct */
> - for (i = 0; i < ELF_NVSRHALFREG; i++)
> - buf[i] = task->thread.ckfp_state.fpr[i][TS_VSRLOWOFFSET];
> - return __copy_to_user(to, buf, ELF_NVSRHALFREG * sizeof(double));
> -}
> -
> -unsigned long copy_ckvsx_from_user(struct task_struct *task,
> - void __user *from)
> -{
> - u64 buf[ELF_NVSRHALFREG];
> - int i;
> -
> - if (__copy_from_user(buf, from, ELF_NVSRHALFREG * sizeof(double)))
> - return 1;
> - for (i = 0; i < ELF_NVSRHALFREG ; i++)
> - task->thread.ckfp_state.fpr[i][TS_VSRLOWOFFSET] = buf[i];
> - return 0;
> -}
> -#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
> -#else
> -inline unsigned long copy_fpr_to_user(void __user *to,
> - struct task_struct *task)
> -{
> - return __copy_to_user(to, task->thread.fp_state.fpr,
> - ELF_NFPREG * sizeof(double));
> -}
> -
> -inline unsigned long copy_fpr_from_user(struct task_struct *task,
> - void __user *from)
> -{
> - return __copy_from_user(task->thread.fp_state.fpr, from,
> - ELF_NFPREG * sizeof(double));
> -}
> -
> -#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
> -inline unsigned long copy_ckfpr_to_user(void __user *to,
> - struct task_struct *task)
> -{
> - return __copy_to_user(to, task->thread.ckfp_state.fpr,
> - ELF_NFPREG * sizeof(double));
> -}
> -
> -inline unsigned long copy_ckfpr_from_user(struct task_struct *task,
> - void __user *from)
> -{
> - return __copy_from_user(task->thread.ckfp_state.fpr, from,
> - ELF_NFPREG * sizeof(double));
> -}
> -#endif /* CONFIG_PPC_TRANSACTIONAL_MEM */
> -#endif
> -
> /*
> * Save the current user registers on the user stack.
> * We only save the altivec/spe registers if the process has used
>
Powered by blists - more mailing lists