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

Merge tag 'seccomp-v6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull seccomp updates from Kees Cook:

 - Provide USER_NOTIFY flag for synchronous mode (Andrei Vagin, Peter
   Oskolkov). This touches the scheduler and perf but has been Acked by
   Peter Zijlstra.

 - Fix regression in syscall skipping and restart tracing on arm32. This
   touches arch/arm/ but has been Acked by Arnd Bergmann.

* tag 'seccomp-v6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  seccomp: Add missing kerndoc notations
  ARM: ptrace: Restore syscall skipping for tracers
  ARM: ptrace: Restore syscall restart tracing
  selftests/seccomp: Handle arm32 corner cases better
  perf/benchmark: add a new benchmark for seccom_unotify
  selftest/seccomp: add a new test for the sync mode of seccomp_user_notify
  seccomp: add the synchronous mode for seccomp_unotify
  sched: add a few helpers to wake up tasks on the current cpu
  sched: add WF_CURRENT_CPU and externise ttwu
  seccomp: don't use semaphore and wait_queue together
parents 5b07aaca 46822860

arch/arm/include/asm/syscall.h

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ static inline int syscall_get_nr(struct task_struct *task, 
	if (IS_ENABLED(CONFIG_AEABI) && !IS_ENABLED(CONFIG_OABI_COMPAT))

		return task_thread_info(task)->abi_syscall;



	if (task_thread_info(task)->abi_syscall == -1)

		return -1;



	return task_thread_info(task)->abi_syscall & __NR_SYSCALL_MASK;

}

arch/arm/kernel/entry-common.S

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ slow_work_pending: 
	cmp	r0, #0

	beq	no_work_pending

	movlt	scno, #(__NR_restart_syscall - __NR_SYSCALL_BASE)

	str	scno, [tsk, #TI_ABI_SYSCALL]	@ make sure tracers see update

	ldmia	sp, {r0 - r6}			@ have to reload r0 - r6

	b	local_restart			@ ... and off we go

ENDPROC(ret_fast_syscall)

arch/arm/kernel/ptrace.c

+3 −2
Original line number Diff line number Diff line
@@ -783,8 +783,9 @@ long arch_ptrace(struct task_struct *child, long request, 
			break;



		case PTRACE_SET_SYSCALL:

			task_thread_info(child)->abi_syscall = data &

							__NR_SYSCALL_MASK;

			if (data != -1)

				data &= __NR_SYSCALL_MASK;

			task_thread_info(child)->abi_syscall = data;

			ret = 0;

			break;

include/linux/completion.h

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ extern bool try_wait_for_completion(struct completion *x); 
extern bool completion_done(struct completion *x);



extern void complete(struct completion *);

extern void complete_on_current_cpu(struct completion *x);

extern void complete_all(struct completion *);



#endif

include/linux/swait.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static inline bool swq_has_sleeper(struct swait_queue_head *wq) 


extern void swake_up_one(struct swait_queue_head *q);

extern void swake_up_all(struct swait_queue_head *q);

extern void swake_up_locked(struct swait_queue_head *q);

extern void swake_up_locked(struct swait_queue_head *q, int wake_flags);



extern void prepare_to_swait_exclusive(struct swait_queue_head *q, struct swait_queue *wait, int state);

extern long prepare_to_swait_event(struct swait_queue_head *q, struct swait_queue *wait, int state);