Commit bcfeebbf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'exit-cleanups-for-v5.15' of...

Merge branch 'exit-cleanups-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull exit cleanups from Eric Biederman:
 "In preparation of doing something about PTRACE_EVENT_EXIT I have
  started cleaning up various pieces of code related to do_exit. Most of
  that code I did not manage to get tested and reviewed before the merge
  window opened but a handful of very useful cleanups are ready to be
  merged.

  The first change is simply the removal of the bdflush system call. The
  code has now been disabled long enough that even the oldest userspace
  working userspace setups anyone can find to test are fine with the
  bdflush system call being removed.

  Changing m68k fsp040_die to use force_sigsegv(SIGSEGV) instead of
  calling do_exit directly is interesting only in that it is nearly the
  most difficult of the incorrect uses of do_exit to remove.

  The change to the seccomp code to simply send a signal instead of
  calling do_coredump directly is a very nice little cleanup made
  possible by realizing the existing signal sending helpers were missing
  a little bit of functionality that is easy to provide"

* 'exit-cleanups-for-v5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  signal/seccomp: Dump core when there is only one live thread
  signal/seccomp: Refactor seccomp signal and coredump generation
  signal/m68k: Use force_sigsegv(SIGSEGV) in fpsp040_die
  exit/bdflush: Remove the deprecated bdflush system call
parents 48983701 d21918e5
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@
259	common	osf_swapctl			sys_ni_syscall
260	common	osf_memcntl			sys_ni_syscall
261	common	osf_fdatasync			sys_ni_syscall
300	common	bdflush				sys_bdflush
300	common	bdflush				sys_ni_syscall
301	common	sethae				sys_sethae
302	common	mount				sys_mount
303	common	old_adjtimex			sys_old_adjtimex
+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@
131	common	quotactl		sys_quotactl
132	common	getpgid			sys_getpgid
133	common	fchdir			sys_fchdir
134	common	bdflush			sys_bdflush
134	common	bdflush			sys_ni_syscall
135	common	sysfs			sys_sysfs
136	common	personality		sys_personality
# 137 was sys_afs_syscall
+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ __SYSCALL(__NR_getpgid, sys_getpgid)
#define __NR_fchdir 133
__SYSCALL(__NR_fchdir, sys_fchdir)
#define __NR_bdflush 134
__SYSCALL(__NR_bdflush, sys_bdflush)
__SYSCALL(__NR_bdflush, sys_ni_syscall)
#define __NR_sysfs 135
__SYSCALL(__NR_sysfs, sys_sysfs)
#define __NR_personality 136
+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@
# 1135 was get_kernel_syms
# 1136 was query_module
113	common	quotactl			sys_quotactl
114	common	bdflush				sys_bdflush
114	common	bdflush				sys_ni_syscall
115	common	sysfs				sys_sysfs
116	common	personality			sys_personality
117	common	afs_syscall			sys_ni_syscall
+2 −1
Original line number Diff line number Diff line
@@ -502,7 +502,8 @@ in_ea:
	.section .fixup,#alloc,#execinstr
	.even
1:
	jbra	fpsp040_die
	jbsr	fpsp040_die
	jbra	.Lnotkern

	.section __ex_table,#alloc
	.align	4
Loading