korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 04:34:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

m68k updates for v6.3

Browse Source 
- Add seccomp support,
   - Defconfig updates,
   - Miscellaneous fixes and improvements.
 -----BEGIN PGP SIGNATURE-----
 
 iIsEABYIADMWIQQ9qaHoIs/1I4cXmEiKwlD9ZEnxcAUCY/NpwhUcZ2VlcnRAbGlu
 dXgtbTY4ay5vcmcACgkQisJQ/WRJ8XB/LgD+OndW88TM184loE00WEECzgJjaOi6
 /3MMHLp/KtjNuIMA/j5V3aM+s33rExNu7b14D1aXC4FYdB7VnMVJ+Xk2cHcH
 =xCVc
 -----END PGP SIGNATURE-----

Merge tag 'm68k-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

 - Add seccomp support

 - defconfig updates

 - Miscellaneous fixes and improvements

* tag 'm68k-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: /proc/hardware should depend on PROC_FS
  selftests/seccomp: Add m68k support
  m68k: Add kernel seccomp support
  m68k: Check syscall_trace_enter() return code
  m68k: defconfig: Update defconfigs for v6.2-rc3
  m68k: q40: Do not initialise statics to 0
This commit is contained in:
Linus Torvalds 2023-02-21 15:17:34 -08:00
commit eb6d5bbea2
24 changed files with 99 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/features/seccomp/seccomp-filter/arch-support.txt
View File

@ -14,7 +14,7 @@
| hexagon: | TODO | | hexagon: | TODO |
| ia64: | TODO | | ia64: | TODO |
| loongarch: | ok | | loongarch: | ok |
| m68k: | TODO | | m68k: | ok |
| microblaze: | TODO | | microblaze: | TODO |
| mips: | ok | | mips: | ok |
| nios2: | TODO | | nios2: | TODO |

2
arch/m68k/68000/entry.S
View File

@ -45,6 +45,8 @@ do_trace:
jbsr syscall_trace_enter jbsr syscall_trace_enter
RESTORE_SWITCH_STACK RESTORE_SWITCH_STACK
addql #4,%sp addql #4,%sp
addql #1,%d0
jeq ret_from_exception
movel %sp@(PT_OFF_ORIG_D0),%d1 movel %sp@(PT_OFF_ORIG_D0),%d1
movel #-ENOSYS,%d0 movel #-ENOSYS,%d0
cmpl #NR_syscalls,%d1 cmpl #NR_syscalls,%d1

2
arch/m68k/Kconfig
View File

@ -18,6 +18,8 @@ config M68K
select GENERIC_CPU_DEVICES select GENERIC_CPU_DEVICES
select GENERIC_IOMAP select GENERIC_IOMAP
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select HAVE_ARCH_SECCOMP
select HAVE_ARCH_SECCOMP_FILTER
select HAVE_ASM_MODVERSIONS select HAVE_ASM_MODVERSIONS
select HAVE_DEBUG_BUGVERBOSE select HAVE_DEBUG_BUGVERBOSE
select HAVE_EFFICIENT_UNALIGNED_ACCESS if !CPU_HAS_NO_UNALIGNED select HAVE_EFFICIENT_UNALIGNED_ACCESS if !CPU_HAS_NO_UNALIGNED

1
arch/m68k/Kconfig.devices
View File

@ -19,6 +19,7 @@ config HEARTBEAT
# We have a dedicated heartbeat LED. :-) # We have a dedicated heartbeat LED. :-)
config PROC_HARDWARE config PROC_HARDWARE
bool "/proc/hardware support" bool "/proc/hardware support"
depends on PROC_FS
help help
Say Y here to support the /proc/hardware file, which gives you Say Y here to support the /proc/hardware file, which gives you
access to information about the machine you're running on, access to information about the machine you're running on,

2
arch/m68k/coldfire/entry.S
View File

@ -90,6 +90,8 @@ ENTRY(system_call)
jbsr syscall_trace_enter jbsr syscall_trace_enter
RESTORE_SWITCH_STACK RESTORE_SWITCH_STACK
addql #4,%sp addql #4,%sp
addql #1,%d0
jeq ret_from_exception
movel %d3,%a0 movel %d3,%a0
jbsr %a0@ jbsr %a0@
movel %d0,%sp@(PT_OFF_D0) /* save the return value */ movel %d0,%sp@(PT_OFF_D0) /* save the return value */

3
arch/m68k/configs/amiga_defconfig
View File

@ -108,7 +108,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -630,7 +629,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -638,7 +636,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

3
arch/m68k/configs/apollo_defconfig
View File

@ -104,7 +104,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -586,7 +585,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -594,7 +592,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

3
arch/m68k/configs/atari_defconfig
View File

@ -111,7 +111,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -607,7 +606,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -615,7 +613,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

3
arch/m68k/configs/bvme6000_defconfig
View File

@ -101,7 +101,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -578,7 +577,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -586,7 +584,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

3
arch/m68k/configs/hp300_defconfig
View File

@ -103,7 +103,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -588,7 +587,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -596,7 +594,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

3
arch/m68k/configs/mac_defconfig
View File

@ -102,7 +102,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -609,7 +608,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -617,7 +615,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

4
arch/m68k/configs/multi_defconfig
View File

@ -122,7 +122,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -315,6 +314,7 @@ CONFIG_AF_KCM=m
# CONFIG_WIRELESS is not set # CONFIG_WIRELESS is not set
CONFIG_PSAMPLE=m CONFIG_PSAMPLE=m
CONFIG_NET_IFE=m CONFIG_NET_IFE=m
CONFIG_PCCARD=y
CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y CONFIG_DEVTMPFS_MOUNT=y
CONFIG_TEST_ASYNC_DRIVER_PROBE=m CONFIG_TEST_ASYNC_DRIVER_PROBE=m
@ -695,7 +695,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -703,7 +702,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

3
arch/m68k/configs/mvme147_defconfig
View File

@ -100,7 +100,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -577,7 +576,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -585,7 +583,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

3
arch/m68k/configs/mvme16x_defconfig
View File

@ -101,7 +101,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -578,7 +577,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -586,7 +584,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

3
arch/m68k/configs/q40_defconfig
View File

@ -102,7 +102,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -596,7 +595,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -604,7 +602,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

3
arch/m68k/configs/sun3_defconfig
View File

@ -98,7 +98,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -576,7 +575,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -584,7 +582,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

3
arch/m68k/configs/sun3x_defconfig
View File

@ -98,7 +98,6 @@ CONFIG_NFT_MASQ=m
CONFIG_NFT_REDIR=m CONFIG_NFT_REDIR=m
CONFIG_NFT_NAT=m CONFIG_NFT_NAT=m
CONFIG_NFT_TUNNEL=m CONFIG_NFT_TUNNEL=m
CONFIG_NFT_OBJREF=m
CONFIG_NFT_QUEUE=m CONFIG_NFT_QUEUE=m
CONFIG_NFT_QUOTA=m CONFIG_NFT_QUOTA=m
CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT=m
@ -576,7 +575,6 @@ CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=m
CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRING_HELPERS=m
CONFIG_TEST_STRSCPY=m
CONFIG_TEST_KSTRTOX=m CONFIG_TEST_KSTRTOX=m
CONFIG_TEST_PRINTF=m CONFIG_TEST_PRINTF=m
CONFIG_TEST_SCANF=m CONFIG_TEST_SCANF=m
@ -584,7 +582,6 @@ CONFIG_TEST_BITMAP=m
CONFIG_TEST_UUID=m CONFIG_TEST_UUID=m
CONFIG_TEST_XARRAY=m CONFIG_TEST_XARRAY=m
CONFIG_TEST_RHASHTABLE=m CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_SIPHASH=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m

11
arch/m68k/include/asm/seccomp.h Normal file
View File

@ -0,0 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#ifndef _ASM_SECCOMP_H
#define _ASM_SECCOMP_H
#include <asm-generic/seccomp.h>
#define SECCOMP_ARCH_NATIVE AUDIT_ARCH_M68K
#define SECCOMP_ARCH_NATIVE_NR NR_syscalls
#define SECCOMP_ARCH_NATIVE_NAME "m68k"
#endif /* _ASM_SECCOMP_H */

57
arch/m68k/include/asm/syscall.h
View File

@ -4,6 +4,63 @@
#include <uapi/linux/audit.h> #include <uapi/linux/audit.h>
#include <asm/unistd.h>
extern const unsigned long sys_call_table[];
static inline int syscall_get_nr(struct task_struct *task,
struct pt_regs *regs)
{
return regs->orig_d0;
}
static inline void syscall_rollback(struct task_struct *task,
struct pt_regs *regs)
{
regs->d0 = regs->orig_d0;
}
static inline long syscall_get_error(struct task_struct *task,
struct pt_regs *regs)
{
unsigned long error = regs->d0;
return IS_ERR_VALUE(error) ? error : 0;
}
static inline long syscall_get_return_value(struct task_struct *task,
struct pt_regs *regs)
{
return regs->d0;
}
static inline void syscall_set_return_value(struct task_struct *task,
struct pt_regs *regs,
int error, long val)
{
regs->d0 = (long)error ?: val;
}
static inline void syscall_get_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned long *args)
{
args[0] = regs->orig_d0;
args++;
memcpy(args, &regs->d1, 5 * sizeof(args[0]));
}
static inline void syscall_set_arguments(struct task_struct *task,
struct pt_regs *regs,
unsigned long *args)
{
regs->orig_d0 = args[0];
args++;
memcpy(&regs->d1, args, 5 * sizeof(args[0]));
}
static inline int syscall_get_arch(struct task_struct *task) static inline int syscall_get_arch(struct task_struct *task)
{ {
return AUDIT_ARCH_M68K; return AUDIT_ARCH_M68K;

2
arch/m68k/include/asm/thread_info.h
View File

@ -61,6 +61,7 @@ static inline struct thread_info *current_thread_info(void)
#define TIF_NOTIFY_RESUME 5 /* callback before returning to user */ #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
#define TIF_SIGPENDING 6 /* signal pending */ #define TIF_SIGPENDING 6 /* signal pending */
#define TIF_NEED_RESCHED 7 /* rescheduling necessary */ #define TIF_NEED_RESCHED 7 /* rescheduling necessary */
#define TIF_SECCOMP 13 /* seccomp syscall filtering active */
#define TIF_DELAYED_TRACE 14 /* single step a syscall */ #define TIF_DELAYED_TRACE 14 /* single step a syscall */
#define TIF_SYSCALL_TRACE 15 /* syscall trace active */ #define TIF_SYSCALL_TRACE 15 /* syscall trace active */
#define TIF_MEMDIE 16 /* is terminating due to OOM killer */ #define TIF_MEMDIE 16 /* is terminating due to OOM killer */
@ -69,6 +70,7 @@ static inline struct thread_info *current_thread_info(void)
#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
#define _TIF_SIGPENDING (1 << TIF_SIGPENDING) #define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED) #define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
#define _TIF_SECCOMP (1 << TIF_SECCOMP)
#define _TIF_DELAYED_TRACE (1 << TIF_DELAYED_TRACE) #define _TIF_DELAYED_TRACE (1 << TIF_DELAYED_TRACE)
#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
#define _TIF_MEMDIE (1 << TIF_MEMDIE) #define _TIF_MEMDIE (1 << TIF_MEMDIE)

6
arch/m68k/kernel/entry.S
View File

@ -184,9 +184,12 @@ do_trace_entry:
jbsr syscall_trace_enter jbsr syscall_trace_enter
RESTORE_SWITCH_STACK RESTORE_SWITCH_STACK
addql #4,%sp addql #4,%sp
addql #1,%d0 | optimization for cmpil #-1,%d0
jeq ret_from_syscall
movel %sp@(PT_OFF_ORIG_D0),%d0 movel %sp@(PT_OFF_ORIG_D0),%d0
cmpl #NR_syscalls,%d0 cmpl #NR_syscalls,%d0
jcs syscall jcs syscall
jra ret_from_syscall
badsys: badsys:
movel #-ENOSYS,%sp@(PT_OFF_D0) movel #-ENOSYS,%sp@(PT_OFF_D0)
jra ret_from_syscall jra ret_from_syscall
@ -211,6 +214,9 @@ ENTRY(system_call)
| syscall trace? | syscall trace?
tstb %a1@(TINFO_FLAGS+2) tstb %a1@(TINFO_FLAGS+2)
jmi do_trace_entry jmi do_trace_entry
| seccomp filter active?
btst #5,%a1@(TINFO_FLAGS+2)
bnes do_trace_entry
cmpl #NR_syscalls,%d0 cmpl #NR_syscalls,%d0
jcc badsys jcc badsys
syscall: syscall:

6
arch/m68k/kernel/ptrace.c
View File

@ -21,7 +21,7 @@
#include <linux/signal.h> #include <linux/signal.h>
#include <linux/regset.h> #include <linux/regset.h>
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/seccomp.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/processor.h> #include <asm/processor.h>
@ -278,6 +278,10 @@ asmlinkage int syscall_trace_enter(void)
if (test_thread_flag(TIF_SYSCALL_TRACE)) if (test_thread_flag(TIF_SYSCALL_TRACE))
ret = ptrace_report_syscall_entry(task_pt_regs(current)); ret = ptrace_report_syscall_entry(task_pt_regs(current));
if (secure_computing() == -1)
return -1;
return ret; return ret;
} }

4
arch/m68k/q40/q40ints.c
View File

@ -201,8 +201,8 @@ static int ccleirq=60; /* ISA dev IRQs*/
#define DEBUG_Q40INT #define DEBUG_Q40INT
/*#define IP_USE_DISABLE *//* would be nice, but crashes ???? */ /*#define IP_USE_DISABLE *//* would be nice, but crashes ???? */
static int mext_disabled=0; /* ext irq disabled by master chip? */ static int mext_disabled; /* ext irq disabled by master chip? */
static int aliased_irq=0; /* how many times inside handler ?*/ static int aliased_irq; /* how many times inside handler ?*/
/* got interrupt, dispatch to ISA or keyboard/timer IRQs */ /* got interrupt, dispatch to ISA or keyboard/timer IRQs */

8
tools/testing/selftests/seccomp/seccomp_bpf.c
View File

@ -138,6 +138,8 @@ struct seccomp_data {
# define __NR_seccomp 337 # define __NR_seccomp 337
# elif defined(__sh__) # elif defined(__sh__)
# define __NR_seccomp 372 # define __NR_seccomp 372
# elif defined(__mc68000__)
# define __NR_seccomp 380
# else # else
# warning "seccomp syscall number unknown for this architecture" # warning "seccomp syscall number unknown for this architecture"
# define __NR_seccomp 0xffff # define __NR_seccomp 0xffff
@ -1838,6 +1840,10 @@ TEST_F(TRACE_poke, getpid_runs_normally)
# define ARCH_REGS struct pt_regs # define ARCH_REGS struct pt_regs
# define SYSCALL_NUM(_regs) (_regs).regs[3] # define SYSCALL_NUM(_regs) (_regs).regs[3]
# define SYSCALL_RET(_regs) (_regs).regs[0] # define SYSCALL_RET(_regs) (_regs).regs[0]
#elif defined(__mc68000__)
# define ARCH_REGS struct user_regs_struct
# define SYSCALL_NUM(_regs) (_regs).orig_d0
# define SYSCALL_RET(_regs) (_regs).d0
#else #else
# error "Do not know how to find your architecture's registers and syscalls" # error "Do not know how to find your architecture's registers and syscalls"
#endif #endif
@ -1902,7 +1908,7 @@ const bool ptrace_entry_set_syscall_ret =
* Use PTRACE_GETREGS and PTRACE_SETREGS when available. This is useful for * Use PTRACE_GETREGS and PTRACE_SETREGS when available. This is useful for
* architectures without HAVE_ARCH_TRACEHOOK (e.g. User-mode Linux). * architectures without HAVE_ARCH_TRACEHOOK (e.g. User-mode Linux).
*/ */
#if defined(__x86_64__) || defined(__i386__) || defined(__mips__) #if defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__mc68000__)
# define ARCH_GETREGS(_regs) ptrace(PTRACE_GETREGS, tracee, 0, &(_regs)) # define ARCH_GETREGS(_regs) ptrace(PTRACE_GETREGS, tracee, 0, &(_regs))
# define ARCH_SETREGS(_regs) ptrace(PTRACE_SETREGS, tracee, 0, &(_regs)) # define ARCH_SETREGS(_regs) ptrace(PTRACE_SETREGS, tracee, 0, &(_regs))
#else #else