From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Arnd Bergmann <arnd@arndb.de>, Christoph Hellwig <hch@lst.de>
Cc: Jeremy Kerr <jk@ozlabs.org>,
linux-kernel@vger.kernel.org,
"Eric W . Biederman" <ebiederm@xmission.com>,
linux-fsdevel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org,
Alexander Viro <viro@zeniv.linux.org.uk>
Subject: Re: [PATCH] fixup! signal: factor copy_siginfo_to_external32 from copy_siginfo_to_user32
Date: Wed, 29 Apr 2020 08:17:22 +0200 [thread overview]
Message-ID: <d00b4436-9a97-5e90-2a6f-e79f90be9736@c-s.fr> (raw)
In-Reply-To: <20200428195645.1365019-1-arnd@arndb.de>
Le 28/04/2020 à 21:56, Arnd Bergmann a écrit :
> I think I found a way to improve the x32 handling:
>
> This is a simplification over Christoph's "[PATCH 2/7] signal: factor
> copy_siginfo_to_external32 from copy_siginfo_to_user32", reducing the
> x32 specifics in the common code to a single #ifdef/#endif check, in
> order to keep it more readable for everyone else.
>
> Christoph, if you like it, please fold into your patch.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Alexander Viro <viro@zeniv.linux.org.uk>
> Cc: Jeremy Kerr <jk@ozlabs.org>
> Cc: Arnd Bergmann <arnd@arndb.de>
> Cc: "Eric W . Biederman" <ebiederm@xmission.com>
> Cc: linuxppc-dev@lists.ozlabs.org
> Cc: linux-fsdevel@vger.kernel.org
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/x86/include/asm/compat.h | 10 ++++++++++
> arch/x86/kernel/signal.c | 23 +++++++++++++++++++++++
> kernel/signal.c | 15 ++-------------
> 3 files changed, 35 insertions(+), 13 deletions(-)
>
[...]
> diff --git a/kernel/signal.c b/kernel/signal.c
> index 1a81602050b4..935facca4860 100644
> --- a/kernel/signal.c
> +++ b/kernel/signal.c
> @@ -3318,29 +3318,18 @@ void copy_siginfo_to_external32(struct compat_siginfo *to,
> }
> }
>
> +#ifndef CONFIG_X86_X32_ABI
Can it be declared __weak instead of enclosing it in an #ifndef ?
> int copy_siginfo_to_user32(struct compat_siginfo __user *to,
> const struct kernel_siginfo *from)
> -#if defined(CONFIG_X86_X32_ABI) || defined(CONFIG_IA32_EMULATION)
> -{
> - return __copy_siginfo_to_user32(to, from, in_x32_syscall());
> -}
> -int __copy_siginfo_to_user32(struct compat_siginfo __user *to,
> - const struct kernel_siginfo *from, bool x32_ABI)
> -#endif
> {
> struct compat_siginfo new;
>
> copy_siginfo_to_external32(&new, from);
> -#ifdef CONFIG_X86_X32_ABI
> - if (x32_ABI && from->si_signo == SIGCHLD) {
> - new._sifields._sigchld_x32._utime = from->si_utime;
> - new._sifields._sigchld_x32._stime = from->si_stime;
> - }
> -#endif
> if (copy_to_user(to, &new, sizeof(struct compat_siginfo)))
> return -EFAULT;
> return 0;
> }
> +#endif
>
> static int post_copy_siginfo_from_user32(kernel_siginfo_t *to,
> const struct compat_siginfo *from)
>
Christophe
next prev parent reply other threads:[~2020-04-29 6:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-21 15:41 remove set_fs calls from the exec and coredump code v3 Christoph Hellwig
2020-04-21 15:41 ` [PATCH 1/7] powerpc/spufs: simplify spufs core dumping Christoph Hellwig
2020-04-21 18:49 ` Al Viro
2020-04-21 19:01 ` Christoph Hellwig
2020-04-21 19:19 ` Al Viro
2020-04-21 19:25 ` Al Viro
2020-04-21 15:41 ` [PATCH 2/7] signal: factor copy_siginfo_to_external32 from copy_siginfo_to_user32 Christoph Hellwig
2020-04-26 4:47 ` Andrew Morton
2020-04-26 7:40 ` Christoph Hellwig
2020-04-27 22:40 ` Andrew Morton
2020-04-28 7:09 ` Christoph Hellwig
2020-04-28 7:45 ` Christophe Leroy
2020-04-28 7:48 ` Christoph Hellwig
2020-04-28 19:56 ` [PATCH] fixup! " Arnd Bergmann
2020-04-29 6:17 ` Christophe Leroy [this message]
2020-04-29 6:29 ` Christoph Hellwig
2020-04-29 6:44 ` Christoph Hellwig
2020-04-29 8:07 ` Arnd Bergmann
2020-04-29 9:42 ` Christoph Hellwig
2020-04-29 11:28 ` Arnd Bergmann
2020-04-29 11:53 ` Christoph Hellwig
2020-04-29 12:34 ` Arnd Bergmann
2020-04-21 15:42 ` [PATCH 3/7] binfmt_elf: femove the set_fs in fill_siginfo_note Christoph Hellwig
2020-04-21 15:42 ` [PATCH 4/7] binfmt_elf: remove the set_fs(KERNEL_DS) in elf_core_dump Christoph Hellwig
2020-04-21 15:42 ` [PATCH 5/7] binfmt_elf_fdpic: remove the set_fs(KERNEL_DS) in elf_fdpic_core_dump Christoph Hellwig
2020-04-21 15:42 ` [PATCH 6/7] exec: simplify the copy_strings_kernel calling convention Christoph Hellwig
2020-04-21 15:42 ` [PATCH 7/7] exec: open code copy_string_kernel Christoph Hellwig
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=d00b4436-9a97-5e90-2a6f-e79f90be9736@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=ebiederm@xmission.com \
--cc=hch@lst.de \
--cc=jk@ozlabs.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=viro@zeniv.linux.org.uk \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).