License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* linux/arch/x86_64/ia32/ia32_signal.c
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
|
|
|
*
|
|
|
|
|
* 1997-11-28 Modified for POSIX.1b signals by Richard Henderson
|
|
|
|
|
* 2000-06-20 Pentium III FXSR, SSE support by Gareth Hughes
|
|
|
|
|
* 2000-12-* x86-64 compatibility mode signal handling by Andi Kleen
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/sched.h>
|
2017-02-09 01:51:37 +08:00
|
|
|
#include <linux/sched/task_stack.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/mm.h>
|
|
|
|
|
#include <linux/smp.h>
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
|
#include <linux/errno.h>
|
|
|
|
|
#include <linux/wait.h>
|
|
|
|
|
#include <linux/unistd.h>
|
|
|
|
|
#include <linux/stddef.h>
|
|
|
|
|
#include <linux/personality.h>
|
|
|
|
|
#include <linux/compat.h>
|
2007-02-13 20:26:26 +08:00
|
|
|
#include <linux/binfmts.h>
|
2024-06-11 20:08:33 +08:00
|
|
|
#include <linux/syscalls.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/ucontext.h>
|
2016-12-25 03:46:01 +08:00
|
|
|
#include <linux/uaccess.h>
|
2015-04-24 08:54:44 +08:00
|
|
|
#include <asm/fpu/internal.h>
|
2015-04-30 14:45:02 +08:00
|
|
|
#include <asm/fpu/signal.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/ptrace.h>
|
|
|
|
|
#include <asm/ia32_unistd.h>
|
|
|
|
|
#include <asm/user32.h>
|
2015-09-05 15:32:43 +08:00
|
|
|
#include <uapi/asm/sigcontext.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/proto.h>
|
2008-01-30 20:30:43 +08:00
|
|
|
#include <asm/vdso.h>
|
2008-12-18 10:52:45 +08:00
|
|
|
#include <asm/sigframe.h>
|
2012-02-19 23:38:43 +08:00
|
|
|
#include <asm/sighandling.h>
|
2012-09-22 08:18:44 +08:00
|
|
|
#include <asm/smap.h>
|
2008-12-18 10:52:45 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* Do a signal return; undo the signal stack.
|
|
|
|
|
*/
|
2009-02-21 11:00:54 +08:00
|
|
|
#define loadsegment_gs(v) load_gs_index(v)
|
|
|
|
|
#define loadsegment_fs(v) loadsegment(fs, v)
|
|
|
|
|
#define loadsegment_ds(v) loadsegment(ds, v)
|
|
|
|
|
#define loadsegment_es(v) loadsegment(es, v)
|
|
|
|
|
|
|
|
|
|
#define get_user_seg(seg) ({ unsigned int v; savesegment(seg, v); v; })
|
|
|
|
|
#define set_user_seg(seg, v) loadsegment_##seg(v)
|
|
|
|
|
|
2008-11-18 07:44:50 +08:00
|
|
|
#define COPY(x) { \
|
2009-01-24 07:50:38 +08:00
|
|
|
get_user_ex(regs->x, &sc->x); \
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2009-02-21 11:00:13 +08:00
|
|
|
#define GET_SEG(seg) ({ \
|
|
|
|
|
unsigned short tmp; \
|
|
|
|
|
get_user_ex(tmp, &sc->seg); \
|
|
|
|
|
tmp; \
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
#define COPY_SEG_CPL3(seg) do { \
|
|
|
|
|
regs->seg = GET_SEG(seg) | 3; \
|
|
|
|
|
} while (0)
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-11-18 07:47:48 +08:00
|
|
|
#define RELOAD_SEG(seg) { \
|
2019-02-25 19:56:35 +08:00
|
|
|
unsigned int pre = (seg) | 3; \
|
2009-02-21 11:00:54 +08:00
|
|
|
unsigned int cur = get_user_seg(seg); \
|
2008-11-18 07:47:48 +08:00
|
|
|
if (pre != cur) \
|
2009-02-21 11:00:54 +08:00
|
|
|
set_user_seg(seg, pre); \
|
2008-11-18 07:47:48 +08:00
|
|
|
}
|
2008-01-30 20:30:07 +08:00
|
|
|
|
|
|
|
|
static int ia32_restore_sigcontext(struct pt_regs *regs,
|
2015-09-05 15:32:41 +08:00
|
|
|
struct sigcontext_32 __user *sc)
|
2008-01-30 20:30:07 +08:00
|
|
|
{
|
2009-02-21 11:00:54 +08:00
|
|
|
unsigned int tmpflags, err = 0;
|
2019-02-25 19:56:35 +08:00
|
|
|
u16 gs, fs, es, ds;
|
2008-07-30 01:29:22 +08:00
|
|
|
void __user *buf;
|
2008-01-30 20:30:07 +08:00
|
|
|
u32 tmp;
|
|
|
|
|
|
|
|
|
|
/* Always make any pending restarted system calls return -EINTR */
|
2015-02-13 07:01:14 +08:00
|
|
|
current->restart_block.fn = do_no_restart_syscall;
|
2008-01-30 20:30:07 +08:00
|
|
|
|
2009-01-24 07:50:38 +08:00
|
|
|
get_user_try {
|
2019-02-25 19:56:35 +08:00
|
|
|
gs = GET_SEG(gs);
|
|
|
|
|
fs = GET_SEG(fs);
|
|
|
|
|
ds = GET_SEG(ds);
|
|
|
|
|
es = GET_SEG(es);
|
2009-01-24 07:50:38 +08:00
|
|
|
|
|
|
|
|
COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx);
|
2015-04-04 20:58:23 +08:00
|
|
|
COPY(dx); COPY(cx); COPY(ip); COPY(ax);
|
2009-01-24 07:50:38 +08:00
|
|
|
/* Don't touch extended registers */
|
|
|
|
|
|
|
|
|
|
COPY_SEG_CPL3(cs);
|
|
|
|
|
COPY_SEG_CPL3(ss);
|
|
|
|
|
|
|
|
|
|
get_user_ex(tmpflags, &sc->flags);
|
|
|
|
|
regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS);
|
|
|
|
|
/* disable syscall checks */
|
|
|
|
|
regs->orig_ax = -1;
|
|
|
|
|
|
|
|
|
|
get_user_ex(tmp, &sc->fpstate);
|
|
|
|
|
buf = compat_ptr(tmp);
|
|
|
|
|
} get_user_catch(err);
|
|
|
|
|
|
2019-02-25 19:56:35 +08:00
|
|
|
/*
|
|
|
|
|
* Reload fs and gs if they have changed in the signal
|
|
|
|
|
* handler. This does not handle long fs/gs base changes in
|
|
|
|
|
* the handler, but does not clobber them at least in the
|
|
|
|
|
* normal case.
|
|
|
|
|
*/
|
|
|
|
|
RELOAD_SEG(gs);
|
|
|
|
|
RELOAD_SEG(fs);
|
|
|
|
|
RELOAD_SEG(ds);
|
|
|
|
|
RELOAD_SEG(es);
|
|
|
|
|
|
2015-04-30 02:55:19 +08:00
|
|
|
err |= fpu__restore_sig(buf, 1);
|
2012-09-22 03:43:15 +08:00
|
|
|
|
2015-03-22 06:54:21 +08:00
|
|
|
force_iret();
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
2024-06-11 20:08:33 +08:00
|
|
|
COMPAT_SYSCALL_DEFINE0(sigreturn)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2012-11-13 03:32:42 +08:00
|
|
|
struct pt_regs *regs = current_pt_regs();
|
2008-12-18 10:51:46 +08:00
|
|
|
struct sigframe_ia32 __user *frame = (struct sigframe_ia32 __user *)(regs->sp-8);
|
2005-04-17 06:20:36 +08:00
|
|
|
sigset_t set;
|
|
|
|
|
|
Remove 'type' argument from access_ok() function
Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.
It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access. But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.
A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model. And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.
This patch was mostly done with a sed-script, with manual fix-ups for
the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form.
There were a couple of notable cases:
- csky still had the old "verify_area()" name as an alias.
- the iter_iov code had magical hardcoded knowledge of the actual
values of VERIFY_{READ,WRITE} (not that they mattered, since nothing
really used it)
- microblaze used the type argument for a debug printout
but other than those oddities this should be a total no-op patch.
I tried to fix up all architectures, did fairly extensive grepping for
access_ok() uses, and the changes are trivial, but I may have missed
something. Any missed conversion should be trivially fixable, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-01-04 10:57:57 +08:00
|
|
|
if (!access_ok(frame, sizeof(*frame)))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto badframe;
|
|
|
|
|
if (__get_user(set.sig[0], &frame->sc.oldmask)
|
|
|
|
|
|| (_COMPAT_NSIG_WORDS > 1
|
2008-01-30 20:30:07 +08:00
|
|
|
&& __copy_from_user((((char *) &set.sig) + 4),
|
|
|
|
|
&frame->extramask,
|
2005-04-17 06:20:36 +08:00
|
|
|
sizeof(frame->extramask))))
|
|
|
|
|
goto badframe;
|
|
|
|
|
|
2011-07-11 03:27:24 +08:00
|
|
|
set_current_blocked(&set);
|
2008-01-30 20:30:07 +08:00
|
|
|
|
2015-04-04 20:58:23 +08:00
|
|
|
if (ia32_restore_sigcontext(regs, &frame->sc))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto badframe;
|
2015-04-04 20:58:23 +08:00
|
|
|
return regs->ax;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
badframe:
|
|
|
|
|
signal_fault(regs, frame, "32bit sigreturn");
|
|
|
|
|
return 0;
|
2008-01-30 20:30:07 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2024-06-11 20:08:33 +08:00
|
|
|
COMPAT_SYSCALL_DEFINE0(rt_sigreturn)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2012-11-13 03:32:42 +08:00
|
|
|
struct pt_regs *regs = current_pt_regs();
|
2008-12-18 10:51:46 +08:00
|
|
|
struct rt_sigframe_ia32 __user *frame;
|
2005-04-17 06:20:36 +08:00
|
|
|
sigset_t set;
|
|
|
|
|
|
2008-12-18 10:51:46 +08:00
|
|
|
frame = (struct rt_sigframe_ia32 __user *)(regs->sp - 4);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
Remove 'type' argument from access_ok() function
Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.
It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access. But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.
A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model. And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.
This patch was mostly done with a sed-script, with manual fix-ups for
the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form.
There were a couple of notable cases:
- csky still had the old "verify_area()" name as an alias.
- the iter_iov code had magical hardcoded knowledge of the actual
values of VERIFY_{READ,WRITE} (not that they mattered, since nothing
really used it)
- microblaze used the type argument for a debug printout
but other than those oddities this should be a total no-op patch.
I tried to fix up all architectures, did fairly extensive grepping for
access_ok() uses, and the changes are trivial, but I may have missed
something. Any missed conversion should be trivially fixable, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-01-04 10:57:57 +08:00
|
|
|
if (!access_ok(frame, sizeof(*frame)))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto badframe;
|
|
|
|
|
if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set)))
|
|
|
|
|
goto badframe;
|
|
|
|
|
|
2011-07-11 03:27:24 +08:00
|
|
|
set_current_blocked(&set);
|
2008-01-30 20:30:07 +08:00
|
|
|
|
2015-04-04 20:58:23 +08:00
|
|
|
if (ia32_restore_sigcontext(regs, &frame->uc.uc_mcontext))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto badframe;
|
|
|
|
|
|
2012-12-15 03:47:53 +08:00
|
|
|
if (compat_restore_altstack(&frame->uc.uc_stack))
|
2005-04-17 06:20:36 +08:00
|
|
|
goto badframe;
|
|
|
|
|
|
2015-04-04 20:58:23 +08:00
|
|
|
return regs->ax;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
badframe:
|
2008-01-30 20:30:07 +08:00
|
|
|
signal_fault(regs, frame, "32bit rt sigreturn");
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
2008-01-30 20:30:07 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Set up a signal frame.
|
|
|
|
|
*/
|
|
|
|
|
|
2015-09-05 15:32:41 +08:00
|
|
|
static int ia32_setup_sigcontext(struct sigcontext_32 __user *sc,
|
2008-07-30 01:29:22 +08:00
|
|
|
void __user *fpstate,
|
2008-01-30 20:30:07 +08:00
|
|
|
struct pt_regs *regs, unsigned int mask)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2009-02-21 11:00:54 +08:00
|
|
|
int err = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-01-24 07:50:38 +08:00
|
|
|
put_user_try {
|
2009-02-21 11:00:54 +08:00
|
|
|
put_user_ex(get_user_seg(gs), (unsigned int __user *)&sc->gs);
|
|
|
|
|
put_user_ex(get_user_seg(fs), (unsigned int __user *)&sc->fs);
|
|
|
|
|
put_user_ex(get_user_seg(ds), (unsigned int __user *)&sc->ds);
|
|
|
|
|
put_user_ex(get_user_seg(es), (unsigned int __user *)&sc->es);
|
2009-01-24 07:50:38 +08:00
|
|
|
|
|
|
|
|
put_user_ex(regs->di, &sc->di);
|
|
|
|
|
put_user_ex(regs->si, &sc->si);
|
|
|
|
|
put_user_ex(regs->bp, &sc->bp);
|
|
|
|
|
put_user_ex(regs->sp, &sc->sp);
|
|
|
|
|
put_user_ex(regs->bx, &sc->bx);
|
|
|
|
|
put_user_ex(regs->dx, &sc->dx);
|
|
|
|
|
put_user_ex(regs->cx, &sc->cx);
|
|
|
|
|
put_user_ex(regs->ax, &sc->ax);
|
2012-03-12 17:25:55 +08:00
|
|
|
put_user_ex(current->thread.trap_nr, &sc->trapno);
|
2009-01-24 07:50:38 +08:00
|
|
|
put_user_ex(current->thread.error_code, &sc->err);
|
|
|
|
|
put_user_ex(regs->ip, &sc->ip);
|
|
|
|
|
put_user_ex(regs->cs, (unsigned int __user *)&sc->cs);
|
|
|
|
|
put_user_ex(regs->flags, &sc->flags);
|
|
|
|
|
put_user_ex(regs->sp, &sc->sp_at_signal);
|
|
|
|
|
put_user_ex(regs->ss, (unsigned int __user *)&sc->ss);
|
|
|
|
|
|
|
|
|
|
put_user_ex(ptr_to_compat(fpstate), &sc->fpstate);
|
|
|
|
|
|
|
|
|
|
/* non-iBCS2 extensions.. */
|
|
|
|
|
put_user_ex(mask, &sc->oldmask);
|
|
|
|
|
put_user_ex(current->thread.cr2, &sc->cr2);
|
|
|
|
|
} put_user_catch(err);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
return err;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Determine which stack to use..
|
|
|
|
|
*/
|
2012-11-10 12:51:47 +08:00
|
|
|
static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
|
2008-07-30 01:29:21 +08:00
|
|
|
size_t frame_size,
|
2012-09-03 05:31:42 +08:00
|
|
|
void __user **fpstate)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2019-04-04 00:41:36 +08:00
|
|
|
unsigned long sp, fx_aligned, math_size;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
/* Default to using normal stack */
|
2008-01-30 20:30:56 +08:00
|
|
|
sp = regs->sp;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
/* This is the X/Open sanctioned signal stack switching. */
|
2012-11-10 12:51:47 +08:00
|
|
|
if (ksig->ka.sa.sa_flags & SA_ONSTACK)
|
|
|
|
|
sp = sigsp(sp, ksig);
|
2005-04-17 06:20:36 +08:00
|
|
|
/* This is the legacy signal stack switching. */
|
2017-07-28 21:00:32 +08:00
|
|
|
else if (regs->ss != __USER32_DS &&
|
2012-11-10 12:51:47 +08:00
|
|
|
!(ksig->ka.sa.sa_flags & SA_RESTORER) &&
|
|
|
|
|
ksig->ka.sa.sa_restorer)
|
|
|
|
|
sp = (unsigned long) ksig->ka.sa.sa_restorer;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2019-04-04 00:41:36 +08:00
|
|
|
sp = fpu__alloc_mathframe(sp, 1, &fx_aligned, &math_size);
|
|
|
|
|
*fpstate = (struct _fpstate_32 __user *) sp;
|
|
|
|
|
if (copy_fpstate_to_sigframe(*fpstate, (void __user *)fx_aligned,
|
|
|
|
|
math_size) < 0)
|
|
|
|
|
return (void __user *) -1L;
|
2008-07-30 01:29:21 +08:00
|
|
|
|
2008-01-30 20:30:56 +08:00
|
|
|
sp -= frame_size;
|
2005-10-10 00:54:23 +08:00
|
|
|
/* Align the stack pointer according to the i386 ABI,
|
|
|
|
|
* i.e. so that on function entry ((sp + 4) & 15) == 0. */
|
2008-01-30 20:30:56 +08:00
|
|
|
sp = ((sp + 4) & -16ul) - 4;
|
|
|
|
|
return (void __user *) sp;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2012-11-10 12:51:47 +08:00
|
|
|
int ia32_setup_frame(int sig, struct ksignal *ksig,
|
2008-01-30 20:30:07 +08:00
|
|
|
compat_sigset_t *set, struct pt_regs *regs)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-12-18 10:51:46 +08:00
|
|
|
struct sigframe_ia32 __user *frame;
|
2008-01-30 20:30:07 +08:00
|
|
|
void __user *restorer;
|
2005-04-17 06:20:36 +08:00
|
|
|
int err = 0;
|
2008-07-30 01:29:22 +08:00
|
|
|
void __user *fpstate = NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-01-30 20:30:07 +08:00
|
|
|
/* copy_to_user optimizes that into a single 8 byte store */
|
|
|
|
|
static const struct {
|
|
|
|
|
u16 poplmovl;
|
|
|
|
|
u32 val;
|
|
|
|
|
u16 int80;
|
|
|
|
|
} __attribute__((packed)) code = {
|
|
|
|
|
0xb858, /* popl %eax ; movl $...,%eax */
|
|
|
|
|
__NR_ia32_sigreturn,
|
|
|
|
|
0x80cd, /* int $0x80 */
|
|
|
|
|
};
|
|
|
|
|
|
2012-11-10 12:51:47 +08:00
|
|
|
frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
Remove 'type' argument from access_ok() function
Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.
It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access. But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.
A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model. And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.
This patch was mostly done with a sed-script, with manual fix-ups for
the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form.
There were a couple of notable cases:
- csky still had the old "verify_area()" name as an alias.
- the iter_iov code had magical hardcoded knowledge of the actual
values of VERIFY_{READ,WRITE} (not that they mattered, since nothing
really used it)
- microblaze used the type argument for a debug printout
but other than those oddities this should be a total no-op patch.
I tried to fix up all architectures, did fairly extensive grepping for
access_ok() uses, and the changes are trivial, but I may have missed
something. Any missed conversion should be trivially fixable, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-01-04 10:57:57 +08:00
|
|
|
if (!access_ok(frame, sizeof(*frame)))
|
2008-09-13 08:01:09 +08:00
|
|
|
return -EFAULT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-09-13 08:02:53 +08:00
|
|
|
if (__put_user(sig, &frame->sig))
|
2008-09-13 08:01:09 +08:00
|
|
|
return -EFAULT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-09-13 08:02:53 +08:00
|
|
|
if (ia32_setup_sigcontext(&frame->sc, fpstate, regs, set->sig[0]))
|
2008-09-13 08:01:09 +08:00
|
|
|
return -EFAULT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
if (_COMPAT_NSIG_WORDS > 1) {
|
2008-09-13 08:02:53 +08:00
|
|
|
if (__copy_to_user(frame->extramask, &set->sig[1],
|
|
|
|
|
sizeof(frame->extramask)))
|
2008-09-13 08:01:09 +08:00
|
|
|
return -EFAULT;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2012-11-10 12:51:47 +08:00
|
|
|
if (ksig->ka.sa.sa_flags & SA_RESTORER) {
|
|
|
|
|
restorer = ksig->ka.sa.sa_restorer;
|
2008-01-30 20:30:43 +08:00
|
|
|
} else {
|
|
|
|
|
/* Return stub is in 32bit vsyscall page */
|
2008-04-09 16:29:27 +08:00
|
|
|
if (current->mm->context.vdso)
|
x86, vdso: Reimplement vdso.so preparation in build-time C
Currently, vdso.so files are prepared and analyzed by a combination
of objcopy, nm, some linker script tricks, and some simple ELF
parsers in the kernel. Replace all of that with plain C code that
runs at build time.
All five vdso images now generate .c files that are compiled and
linked in to the kernel image.
This should cause only one userspace-visible change: the loaded vDSO
images are stripped more heavily than they used to be. Everything
outside the loadable segment is dropped. In particular, this causes
the section table and section name strings to be missing. This
should be fine: real dynamic loaders don't load or inspect these
tables anyway. The result is roughly equivalent to eu-strip's
--strip-sections option.
The purpose of this change is to enable the vvar and hpet mappings
to be moved to the page following the vDSO load segment. Currently,
it is possible for the section table to extend into the page after
the load segment, so, if we map it, it risks overlapping the vvar or
hpet page. This happens whenever the load segment is just under a
multiple of PAGE_SIZE.
The only real subtlety here is that the old code had a C file with
inline assembler that did 'call VDSO32_vsyscall' and a linker script
that defined 'VDSO32_vsyscall = __kernel_vsyscall'. This most
likely worked by accident: the linker script entry defines a symbol
associated with an address as opposed to an alias for the real
dynamic symbol __kernel_vsyscall. That caused ld to relocate the
reference at link time instead of leaving an interposable dynamic
relocation. Since the VDSO32_vsyscall hack is no longer needed, I
now use 'call __kernel_vsyscall', and I added -Bsymbolic to make it
work. vdso2c will generate an error and abort the build if the
resulting image contains any dynamic relocations, so we won't
silently generate bad vdso images.
(Dynamic relocations are a problem because nothing will even attempt
to relocate the vdso.)
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/2c4fcf45524162a34d87fdda1eb046b2a5cecee7.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2014-05-06 03:19:34 +08:00
|
|
|
restorer = current->mm->context.vdso +
|
2015-10-06 08:47:56 +08:00
|
|
|
vdso_image_32.sym___kernel_sigreturn;
|
2008-01-30 20:30:43 +08:00
|
|
|
else
|
2008-01-30 20:33:23 +08:00
|
|
|
restorer = &frame->retcode;
|
2008-01-30 20:30:43 +08:00
|
|
|
}
|
2008-01-30 20:30:07 +08:00
|
|
|
|
2009-01-24 07:50:38 +08:00
|
|
|
put_user_try {
|
|
|
|
|
put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* These are actually not used anymore, but left because some
|
|
|
|
|
* gdb versions depend on them as a marker.
|
|
|
|
|
*/
|
2012-09-03 05:31:42 +08:00
|
|
|
put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
|
2009-01-24 07:50:38 +08:00
|
|
|
} put_user_catch(err);
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (err)
|
2008-09-13 08:01:09 +08:00
|
|
|
return -EFAULT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
/* Set up registers for signal handler */
|
2008-01-30 20:30:56 +08:00
|
|
|
regs->sp = (unsigned long) frame;
|
2012-11-10 12:51:47 +08:00
|
|
|
regs->ip = (unsigned long) ksig->ka.sa.sa_handler;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-09-26 16:52:41 +08:00
|
|
|
/* Make -mregparm=3 work */
|
2008-01-30 20:30:56 +08:00
|
|
|
regs->ax = sig;
|
|
|
|
|
regs->dx = 0;
|
|
|
|
|
regs->cx = 0;
|
2006-09-26 16:52:41 +08:00
|
|
|
|
2008-08-20 04:04:19 +08:00
|
|
|
loadsegment(ds, __USER32_DS);
|
|
|
|
|
loadsegment(es, __USER32_DS);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-01-30 20:30:07 +08:00
|
|
|
regs->cs = __USER32_CS;
|
|
|
|
|
regs->ss = __USER32_DS;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-09-26 16:52:26 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
2012-11-10 12:51:47 +08:00
|
|
|
int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
|
2008-01-30 20:30:07 +08:00
|
|
|
compat_sigset_t *set, struct pt_regs *regs)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-12-18 10:51:46 +08:00
|
|
|
struct rt_sigframe_ia32 __user *frame;
|
2008-01-30 20:30:43 +08:00
|
|
|
void __user *restorer;
|
2005-04-17 06:20:36 +08:00
|
|
|
int err = 0;
|
2008-07-30 01:29:22 +08:00
|
|
|
void __user *fpstate = NULL;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-01-30 20:30:07 +08:00
|
|
|
/* __copy_to_user optimizes that into a single 8 byte store */
|
|
|
|
|
static const struct {
|
|
|
|
|
u8 movl;
|
|
|
|
|
u32 val;
|
|
|
|
|
u16 int80;
|
2008-11-12 11:11:39 +08:00
|
|
|
u8 pad;
|
2008-01-30 20:30:07 +08:00
|
|
|
} __attribute__((packed)) code = {
|
|
|
|
|
0xb8,
|
|
|
|
|
__NR_ia32_rt_sigreturn,
|
|
|
|
|
0x80cd,
|
|
|
|
|
0,
|
|
|
|
|
};
|
|
|
|
|
|
2012-11-10 12:51:47 +08:00
|
|
|
frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
Remove 'type' argument from access_ok() function
Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.
It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access. But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.
A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model. And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.
This patch was mostly done with a sed-script, with manual fix-ups for
the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form.
There were a couple of notable cases:
- csky still had the old "verify_area()" name as an alias.
- the iter_iov code had magical hardcoded knowledge of the actual
values of VERIFY_{READ,WRITE} (not that they mattered, since nothing
really used it)
- microblaze used the type argument for a debug printout
but other than those oddities this should be a total no-op patch.
I tried to fix up all architectures, did fairly extensive grepping for
access_ok() uses, and the changes are trivial, but I may have missed
something. Any missed conversion should be trivially fixable, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2019-01-04 10:57:57 +08:00
|
|
|
if (!access_ok(frame, sizeof(*frame)))
|
2008-09-13 08:01:09 +08:00
|
|
|
return -EFAULT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-01-24 07:50:38 +08:00
|
|
|
put_user_try {
|
|
|
|
|
put_user_ex(sig, &frame->sig);
|
|
|
|
|
put_user_ex(ptr_to_compat(&frame->info), &frame->pinfo);
|
|
|
|
|
put_user_ex(ptr_to_compat(&frame->uc), &frame->puc);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2009-01-24 07:50:38 +08:00
|
|
|
/* Create the ucontext. */
|
2019-07-12 11:53:56 +08:00
|
|
|
if (static_cpu_has(X86_FEATURE_XSAVE))
|
2009-01-24 07:50:38 +08:00
|
|
|
put_user_ex(UC_FP_XSTATE, &frame->uc.uc_flags);
|
|
|
|
|
else
|
|
|
|
|
put_user_ex(0, &frame->uc.uc_flags);
|
|
|
|
|
put_user_ex(0, &frame->uc.uc_link);
|
2013-09-02 03:35:01 +08:00
|
|
|
compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp);
|
2009-01-24 07:50:38 +08:00
|
|
|
|
2012-11-10 12:51:47 +08:00
|
|
|
if (ksig->ka.sa.sa_flags & SA_RESTORER)
|
|
|
|
|
restorer = ksig->ka.sa.sa_restorer;
|
2009-01-24 07:50:38 +08:00
|
|
|
else
|
x86, vdso: Reimplement vdso.so preparation in build-time C
Currently, vdso.so files are prepared and analyzed by a combination
of objcopy, nm, some linker script tricks, and some simple ELF
parsers in the kernel. Replace all of that with plain C code that
runs at build time.
All five vdso images now generate .c files that are compiled and
linked in to the kernel image.
This should cause only one userspace-visible change: the loaded vDSO
images are stripped more heavily than they used to be. Everything
outside the loadable segment is dropped. In particular, this causes
the section table and section name strings to be missing. This
should be fine: real dynamic loaders don't load or inspect these
tables anyway. The result is roughly equivalent to eu-strip's
--strip-sections option.
The purpose of this change is to enable the vvar and hpet mappings
to be moved to the page following the vDSO load segment. Currently,
it is possible for the section table to extend into the page after
the load segment, so, if we map it, it risks overlapping the vvar or
hpet page. This happens whenever the load segment is just under a
multiple of PAGE_SIZE.
The only real subtlety here is that the old code had a C file with
inline assembler that did 'call VDSO32_vsyscall' and a linker script
that defined 'VDSO32_vsyscall = __kernel_vsyscall'. This most
likely worked by accident: the linker script entry defines a symbol
associated with an address as opposed to an alias for the real
dynamic symbol __kernel_vsyscall. That caused ld to relocate the
reference at link time instead of leaving an interposable dynamic
relocation. Since the VDSO32_vsyscall hack is no longer needed, I
now use 'call __kernel_vsyscall', and I added -Bsymbolic to make it
work. vdso2c will generate an error and abort the build if the
resulting image contains any dynamic relocations, so we won't
silently generate bad vdso images.
(Dynamic relocations are a problem because nothing will even attempt
to relocate the vdso.)
Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Link: http://lkml.kernel.org/r/2c4fcf45524162a34d87fdda1eb046b2a5cecee7.1399317206.git.luto@amacapital.net
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2014-05-06 03:19:34 +08:00
|
|
|
restorer = current->mm->context.vdso +
|
2015-10-06 08:47:56 +08:00
|
|
|
vdso_image_32.sym___kernel_rt_sigreturn;
|
2009-01-24 07:50:38 +08:00
|
|
|
put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Not actually used anymore, but left because some gdb
|
|
|
|
|
* versions need it.
|
|
|
|
|
*/
|
2012-09-03 05:31:42 +08:00
|
|
|
put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
|
2009-01-24 07:50:38 +08:00
|
|
|
} put_user_catch(err);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2016-09-05 21:33:08 +08:00
|
|
|
err |= __copy_siginfo_to_user32(&frame->info, &ksig->info, false);
|
2012-09-22 03:43:15 +08:00
|
|
|
err |= ia32_setup_sigcontext(&frame->uc.uc_mcontext, fpstate,
|
|
|
|
|
regs, set->sig[0]);
|
|
|
|
|
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
|
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
if (err)
|
2008-09-13 08:01:09 +08:00
|
|
|
return -EFAULT;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
/* Set up registers for signal handler */
|
2008-01-30 20:30:56 +08:00
|
|
|
regs->sp = (unsigned long) frame;
|
2012-11-10 12:51:47 +08:00
|
|
|
regs->ip = (unsigned long) ksig->ka.sa.sa_handler;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-10-30 11:26:17 +08:00
|
|
|
/* Make -mregparm=3 work */
|
2008-01-30 20:30:56 +08:00
|
|
|
regs->ax = sig;
|
|
|
|
|
regs->dx = (unsigned long) &frame->info;
|
|
|
|
|
regs->cx = (unsigned long) &frame->uc;
|
2006-10-30 11:26:17 +08:00
|
|
|
|
2008-08-20 04:04:19 +08:00
|
|
|
loadsegment(ds, __USER32_DS);
|
|
|
|
|
loadsegment(es, __USER32_DS);
|
2008-01-30 20:30:07 +08:00
|
|
|
|
|
|
|
|
regs->cs = __USER32_CS;
|
|
|
|
|
regs->ss = __USER32_DS;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2006-09-26 16:52:26 +08:00
|
|
|
return 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|