seccomp: Document RESTART_BEFORE_RECV and O_PATH addfd

Describe SECCOMP_FILTER_FLAG_RESTART_BEFORE_RECV in the UAPI header, as
SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV is described above it, and say in
the documentation that supervisors must tolerate ENOENT from
SECCOMP_IOCTL_NOTIF_RECV, which the flag makes routine. Note at the
fget_raw() call that O_PATH files are allowed on purpose.

Build tested ARCH=x86_64 defconfig (kernel/seccomp.o and headers) with
GCC 16.2.0, and SPHINXDIRS=userspace-api htmldocs.

Assisted-by: LLM
Signed-off-by: Kees Cook <kees@kernel.org>
This commit is contained in:
Kees Cook 2026-10-06 01:41:05 -07:00
parent c96a4cb2c8
commit 9e9bd8f8ac
4 changed files with 11 additions and 0 deletions

View File

@ -292,6 +292,14 @@ for calls such as ``close`` where callers do not retry on ``EINTR``.
A failed notification receive that resets the notification to its initial
state is also eligible for restart.
Each restart withdraws the pending notification, so a supervisor woken by
``poll()``, or blocked in ``ioctl(SECCOMP_IOCTL_NOTIF_RECV)``, may find
nothing left to receive, and the ioctl then fails with ``ENOENT``. This
already happens whenever a notifying process is interrupted before receipt,
but with this flag it becomes routine under repeated signals. Supervisors
should treat ``ENOENT`` from ``SECCOMP_IOCTL_NOTIF_RECV`` as a reason to wait
again, not as an error.
The flag requires ``SECCOMP_FILTER_FLAG_NEW_LISTENER`` and can be used with
or without ``SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV``. Using both flags allows
handlers to run before receipt and defers non-fatal signals during supervisor

View File

@ -25,6 +25,7 @@
#define SECCOMP_FILTER_FLAG_TSYNC_ESRCH (1UL << 4)
/* Received notifications wait in killable state (only respond to fatal signals) */
#define SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV (1UL << 5)
/* Restart syscalls interrupted before their notification is received */
#define SECCOMP_FILTER_FLAG_RESTART_BEFORE_RECV (1UL << 6)
/*

View File

@ -1743,6 +1743,7 @@ static long seccomp_notify_addfd(struct seccomp_filter *filter,
if (addfd.newfd && !(addfd.flags & SECCOMP_ADDFD_FLAG_SETFD))
return -EINVAL;
/* Allow O_PATH files, as SCM_RIGHTS and pidfd_getfd() do. */
kaddfd.file = fget_raw(addfd.srcfd);
if (!kaddfd.file)
return -EBADF;

View File

@ -25,6 +25,7 @@
#define SECCOMP_FILTER_FLAG_TSYNC_ESRCH (1UL << 4)
/* Received notifications wait in killable state (only respond to fatal signals) */
#define SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV (1UL << 5)
/* Restart syscalls interrupted before their notification is received */
#define SECCOMP_FILTER_FLAG_RESTART_BEFORE_RECV (1UL << 6)
/*