From: ebiederm@xmission.com (Eric W. Biederman) To: Christoph Hellwig <hch@lst.de> Cc: Andrew Morton <akpm@linux-foundation.org>, Alexander Viro <viro@zeniv.linux.org.uk>, Jeremy Kerr <jk@ozlabs.org>, Arnd Bergmann <arnd@arndb.de>, linuxppc-dev@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org Subject: [PATCH 2/2] signal: Remove the set_fs in binfmt_elf.c:fill_siginfo_note Date: Fri, 17 Apr 2020 16:09:56 -0500 [thread overview] Message-ID: <87eeslakez.fsf_-_@x220.int.ebiederm.org> (raw) In-Reply-To: <87pnc5akhk.fsf@x220.int.ebiederm.org> (Eric W. Biederman's message of "Fri, 17 Apr 2020 16:08:23 -0500") The code in binfmt_elf.c is differnt from the rest of the code that processes siginfo, as it sends siginfo from a kernel buffer to a file rather than from kernel memory to userspace buffers. To remove it's use of set_fs the code needs some different siginfo helpers. Add the helper copy_siginfo_to_external to copy from the kernel's internal siginfo layout to a buffer in the siginfo layout that userspace expects. Modify fill_siginfo_note to use copy_siginfo_to_external instead of set_fs and copy_siginfo_to_user. Update compat_binfmt_elf.c to use the previously added copy_siginfo_to_external32 to handle the compat case. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> --- fs/binfmt_elf.c | 5 +---- fs/compat_binfmt_elf.c | 2 +- include/linux/signal.h | 7 +++++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 13f25e241ac4..a1f57e20c3cf 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1556,10 +1556,7 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm) 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); + copy_siginfo_to_external(csigdata, siginfo); fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata); } diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c index aaad4ca1217e..fa0e24e1b726 100644 --- a/fs/compat_binfmt_elf.c +++ b/fs/compat_binfmt_elf.c @@ -39,7 +39,7 @@ */ #define user_long_t compat_long_t #define user_siginfo_t compat_siginfo_t -#define copy_siginfo_to_user copy_siginfo_to_user32 +#define copy_siginfo_to_external copy_siginfo_to_external32 /* * The machine-dependent core note format types are defined in elfcore-compat.h, diff --git a/include/linux/signal.h b/include/linux/signal.h index 05bacd2ab135..c1796321cadb 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -24,6 +24,13 @@ static inline void clear_siginfo(kernel_siginfo_t *info) #define SI_EXPANSION_SIZE (sizeof(struct siginfo) - sizeof(struct kernel_siginfo)) +static inline void copy_siginfo_to_external(siginfo_t *to, + const kernel_siginfo_t *from) +{ + memcpy(to, from, sizeof(*from)); + memset(((char *)to) + sizeof(struct kernel_siginfo), 0, SI_EXPANSION_SIZE); +} + int copy_siginfo_to_user(siginfo_t __user *to, const kernel_siginfo_t *from); int copy_siginfo_from_user(kernel_siginfo_t *to, const siginfo_t __user *from); -- 2.25.0
WARNING: multiple messages have this Message-ID (diff)
From: ebiederm@xmission.com (Eric W. Biederman) To: Christoph Hellwig <hch@lst.de> Cc: Arnd Bergmann <arnd@arndb.de>, x86@kernel.org, linux-kernel@vger.kernel.org, Alexander Viro <viro@zeniv.linux.org.uk>, linux-fsdevel@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>, linuxppc-dev@lists.ozlabs.org, Jeremy Kerr <jk@ozlabs.org> Subject: [PATCH 2/2] signal: Remove the set_fs in binfmt_elf.c:fill_siginfo_note Date: Fri, 17 Apr 2020 16:09:56 -0500 [thread overview] Message-ID: <87eeslakez.fsf_-_@x220.int.ebiederm.org> (raw) In-Reply-To: <87pnc5akhk.fsf@x220.int.ebiederm.org> (Eric W. Biederman's message of "Fri, 17 Apr 2020 16:08:23 -0500") The code in binfmt_elf.c is differnt from the rest of the code that processes siginfo, as it sends siginfo from a kernel buffer to a file rather than from kernel memory to userspace buffers. To remove it's use of set_fs the code needs some different siginfo helpers. Add the helper copy_siginfo_to_external to copy from the kernel's internal siginfo layout to a buffer in the siginfo layout that userspace expects. Modify fill_siginfo_note to use copy_siginfo_to_external instead of set_fs and copy_siginfo_to_user. Update compat_binfmt_elf.c to use the previously added copy_siginfo_to_external32 to handle the compat case. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com> --- fs/binfmt_elf.c | 5 +---- fs/compat_binfmt_elf.c | 2 +- include/linux/signal.h | 7 +++++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c index 13f25e241ac4..a1f57e20c3cf 100644 --- a/fs/binfmt_elf.c +++ b/fs/binfmt_elf.c @@ -1556,10 +1556,7 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm) 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); + copy_siginfo_to_external(csigdata, siginfo); fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata); } diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c index aaad4ca1217e..fa0e24e1b726 100644 --- a/fs/compat_binfmt_elf.c +++ b/fs/compat_binfmt_elf.c @@ -39,7 +39,7 @@ */ #define user_long_t compat_long_t #define user_siginfo_t compat_siginfo_t -#define copy_siginfo_to_user copy_siginfo_to_user32 +#define copy_siginfo_to_external copy_siginfo_to_external32 /* * The machine-dependent core note format types are defined in elfcore-compat.h, diff --git a/include/linux/signal.h b/include/linux/signal.h index 05bacd2ab135..c1796321cadb 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -24,6 +24,13 @@ static inline void clear_siginfo(kernel_siginfo_t *info) #define SI_EXPANSION_SIZE (sizeof(struct siginfo) - sizeof(struct kernel_siginfo)) +static inline void copy_siginfo_to_external(siginfo_t *to, + const kernel_siginfo_t *from) +{ + memcpy(to, from, sizeof(*from)); + memset(((char *)to) + sizeof(struct kernel_siginfo), 0, SI_EXPANSION_SIZE); +} + int copy_siginfo_to_user(siginfo_t __user *to, const kernel_siginfo_t *from); int copy_siginfo_from_user(kernel_siginfo_t *to, const siginfo_t __user *from); -- 2.25.0
next prev parent reply other threads:[~2020-04-17 21:13 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 ` Eric W. Biederman [this message] 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-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 ` [PATCH 4/8] binfmt_elf: open code copy_siginfo_to_user to kernelspace buffer Christoph Hellwig 2020-04-14 7:01 ` 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=87eeslakez.fsf_-_@x220.int.ebiederm.org \ --to=ebiederm@xmission.com \ --cc=akpm@linux-foundation.org \ --cc=arnd@arndb.de \ --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 \ --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.