From: Christoph Hellwig <hch@lst.de> To: Andrew Morton <akpm@linux-foundation.org>, Alexander Viro <viro@zeniv.linux.org.uk> Cc: Jeremy Kerr <jk@ozlabs.org>, Arnd Bergmann <arnd@arndb.de>, "Eric W . Biederman" <ebiederm@xmission.com>, linuxppc-dev@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/8] binfmt_elf: open code copy_siginfo_to_user to kernelspace buffer Date: Tue, 14 Apr 2020 09:01:38 +0200 [thread overview] Message-ID: <20200414070142.288696-5-hch@lst.de> (raw) In-Reply-To: <20200414070142.288696-1-hch@lst.de> Instead of messing with the address limit just open code the trivial memcpy + memset logic for the native version, and a call to to_compat_siginfo for the compat version. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/binfmt_elf.c | 9 +++++---- fs/compat_binfmt_elf.c | 6 +++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 13f25e241ac4..607c5a5f855e 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1553,15 +1553,16 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm) fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); } +#ifndef fill_siginfo_note static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata, const kernel_siginfo_t *siginfo) { - mm_segment_t old_fs = get_fs(); - set_fs(KERNEL_DS); - copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo); - set_fs(old_fs); + memcpy(csigdata, siginfo, sizeof(struct kernel_siginfo)); + memset((char *)csigdata + sizeof(struct kernel_siginfo), 0, + SI_EXPANSION_SIZE); fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata); } +#endif #define MAX_FILE_NOTE_SIZE (4*1024*1024) /* diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c index aaad4ca1217e..ab84e095618b 100644 --- a/fs/compat_binfmt_elf.c +++ b/fs/compat_binfmt_elf.c @@ -39,7 +39,11 @@ */ #define user_long_t compat_long_t #define user_siginfo_t compat_siginfo_t -#define copy_siginfo_to_user copy_siginfo_to_user32 +#define fill_siginfo_note(note, csigdata, siginfo) \ +do { \ + to_compat_siginfo(csigdata, siginfo, compat_siginfo_flags()); \ + fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata); \ +} while (0) /* * The machine-dependent core note format types are defined in elfcore-compat.h, -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Andrew Morton <akpm@linux-foundation.org>, Alexander Viro <viro@zeniv.linux.org.uk> Cc: Arnd Bergmann <arnd@arndb.de>, linux-kernel@vger.kernel.org, Jeremy Kerr <jk@ozlabs.org>, linux-fsdevel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, "Eric W . Biederman" <ebiederm@xmission.com> Subject: [PATCH 4/8] binfmt_elf: open code copy_siginfo_to_user to kernelspace buffer Date: Tue, 14 Apr 2020 09:01:38 +0200 [thread overview] Message-ID: <20200414070142.288696-5-hch@lst.de> (raw) In-Reply-To: <20200414070142.288696-1-hch@lst.de> Instead of messing with the address limit just open code the trivial memcpy + memset logic for the native version, and a call to to_compat_siginfo for the compat version. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/binfmt_elf.c | 9 +++++---- fs/compat_binfmt_elf.c | 6 +++++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 13f25e241ac4..607c5a5f855e 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1553,15 +1553,16 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm) fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv); } +#ifndef fill_siginfo_note static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata, const kernel_siginfo_t *siginfo) { - mm_segment_t old_fs = get_fs(); - set_fs(KERNEL_DS); - copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo); - set_fs(old_fs); + memcpy(csigdata, siginfo, sizeof(struct kernel_siginfo)); + memset((char *)csigdata + sizeof(struct kernel_siginfo), 0, + SI_EXPANSION_SIZE); fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata); } +#endif #define MAX_FILE_NOTE_SIZE (4*1024*1024) /* diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c index aaad4ca1217e..ab84e095618b 100644 --- a/fs/compat_binfmt_elf.c +++ b/fs/compat_binfmt_elf.c @@ -39,7 +39,11 @@ */ #define user_long_t compat_long_t #define user_siginfo_t compat_siginfo_t -#define copy_siginfo_to_user copy_siginfo_to_user32 +#define fill_siginfo_note(note, csigdata, siginfo) \ +do { \ + to_compat_siginfo(csigdata, siginfo, compat_siginfo_flags()); \ + fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata); \ +} while (0) /* * The machine-dependent core note format types are defined in elfcore-compat.h, -- 2.25.1
next prev parent reply other threads:[~2020-04-14 7:03 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-14 7:01 remove set_fs calls from the exec and coredump code v2 Christoph Hellwig 2020-04-14 7:01 ` Christoph Hellwig 2020-04-14 7:01 ` [PATCH 1/8] powerpc/spufs: simplify spufs core dumping Christoph Hellwig 2020-04-14 7:01 ` Christoph Hellwig 2020-04-14 7:01 ` [PATCH 2/8] signal: clean up __copy_siginfo_to_user32 Christoph Hellwig 2020-04-14 7:01 ` Christoph Hellwig 2020-04-17 21:08 ` Eric W. Biederman 2020-04-17 21:08 ` Eric W. Biederman 2020-04-17 21:09 ` [PATCH 1/2] signal: Factor copy_siginfo_to_external32 from copy_siginfo_to_user32 Eric W. Biederman 2020-04-17 21:09 ` Eric W. Biederman 2020-04-18 8:05 ` Christophe Leroy 2020-04-18 11:55 ` Eric W. Biederman 2020-04-18 11:55 ` Eric W. Biederman 2020-04-19 8:13 ` Christoph Hellwig 2020-04-19 8:13 ` Christoph Hellwig 2020-04-19 9:46 ` Christophe Leroy 2020-04-19 9:54 ` Christophe Leroy 2020-04-19 8:05 ` Christoph Hellwig 2020-04-19 8:05 ` Christoph Hellwig 2020-04-17 21:09 ` [PATCH 2/2] signal: Remove the set_fs in binfmt_elf.c:fill_siginfo_note Eric W. Biederman 2020-04-17 21:09 ` Eric W. Biederman 2020-04-19 8:03 ` [PATCH 2/8] signal: clean up __copy_siginfo_to_user32 Christoph Hellwig 2020-04-19 8:03 ` Christoph Hellwig 2020-04-14 7:01 ` [PATCH 3/8] signal: replace __copy_siginfo_to_user32 with to_compat_siginfo Christoph Hellwig 2020-04-14 7:01 ` Christoph Hellwig 2020-04-14 14:00 ` Arnd Bergmann 2020-04-14 14:00 ` Arnd Bergmann 2020-04-14 7:01 ` Christoph Hellwig [this message] 2020-04-14 7:01 ` [PATCH 4/8] binfmt_elf: open code copy_siginfo_to_user to kernelspace buffer Christoph Hellwig 2020-04-14 13:15 ` Arnd Bergmann 2020-04-14 13:15 ` Arnd Bergmann 2020-04-15 7:45 ` Christoph Hellwig 2020-04-15 7:45 ` Christoph Hellwig 2020-04-15 8:20 ` Arnd Bergmann 2020-04-15 8:20 ` Arnd Bergmann 2020-04-17 13:27 ` Christoph Hellwig 2020-04-17 13:27 ` Christoph Hellwig 2020-04-17 18:10 ` Eric W. Biederman 2020-04-17 18:10 ` Eric W. Biederman 2020-04-17 20:06 ` Arnd Bergmann 2020-04-17 20:06 ` Arnd Bergmann 2020-04-15 3:01 ` Michael Ellerman 2020-04-15 3:01 ` Michael Ellerman 2020-04-15 6:19 ` Christoph Hellwig 2020-04-15 6:19 ` Christoph Hellwig 2020-04-14 7:01 ` [PATCH 5/8] binfmt_elf: remove the set_fs(KERNEL_DS) in elf_core_dump Christoph Hellwig 2020-04-14 7:01 ` Christoph Hellwig 2020-04-14 7:01 ` [PATCH 6/8] binfmt_elf_fdpic: remove the set_fs(KERNEL_DS) in elf_fdpic_core_dump Christoph Hellwig 2020-04-14 7:01 ` Christoph Hellwig 2020-04-14 7:01 ` [PATCH 7/8] exec: simplify the copy_strings_kernel calling convention Christoph Hellwig 2020-04-14 7:01 ` Christoph Hellwig 2020-04-14 7:01 ` [PATCH 8/8] exec: open code copy_string_kernel Christoph Hellwig 2020-04-14 7:01 ` Christoph Hellwig 2020-04-18 8:15 ` Christophe Leroy 2020-04-18 8:15 ` Christophe Leroy 2020-04-19 8:06 ` Christoph Hellwig 2020-04-19 8:06 ` Christoph Hellwig 2020-04-19 9:44 ` Christophe Leroy 2020-04-19 9:44 ` Christophe Leroy 2020-04-17 22:41 ` remove set_fs calls from the exec and coredump code v2 Eric W. Biederman 2020-04-17 22:41 ` Eric W. Biederman 2020-04-19 8:19 ` Christoph Hellwig 2020-04-19 8:19 ` Christoph Hellwig 2020-04-19 11:50 ` Eric W. Biederman 2020-04-19 11:50 ` Eric W. Biederman
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=20200414070142.288696-5-hch@lst.de \ --to=hch@lst.de \ --cc=akpm@linux-foundation.org \ --cc=arnd@arndb.de \ --cc=ebiederm@xmission.com \ --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: 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.