History

Backmerge tag 'v6.14-rc6' into drm-next

This is a backmerge from Linux 6.14-rc6, needed for the nova PR.

Dave Airlie committed 1 year ago

Commit 626fb112 parents e5dc4f6 80e54e8544 files · +5751 −2862Browse files

Showing the changes to include/uapi/linux (1 of 544 files). Show all

Unified · Split

include/uapi/linux/landlock.h+6−2
@@ -268,7 +268,9 @@ struct landlock_net_port_attr { · 267 unmodified lines
268 * ~~~~~~~~~~~~~~~~268 * ~~~~~~~~~~~~~~~~
269 *269 *
270 * These flags enable to restrict a sandboxed process to a set of network270 * These flags enable to restrict a sandboxed process to a set of network
271 * actions. This is supported since the Landlock ABI version 4.271 * actions.
272 *
273 * This is supported since Landlock ABI version 4.
272 *274 *
273 * The following access rights apply to TCP port numbers:275 * The following access rights apply to TCP port numbers:
274 *276 *
@@ -291,11 +293,13 @@ struct landlock_net_port_attr { · 16 unmodified lines
291 * Setting a flag for a ruleset will isolate the Landlock domain to forbid293 * Setting a flag for a ruleset will isolate the Landlock domain to forbid
292 * connections to resources outside the domain.294 * connections to resources outside the domain.
293 *295 *
296 * This is supported since Landlock ABI version 6.
297 *
294 * Scopes:298 * Scopes:
295 *299 *
296 * - %LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET: Restrict a sandboxed process from300 * - %LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET: Restrict a sandboxed process from
297 * connecting to an abstract UNIX socket created by a process outside the301 * connecting to an abstract UNIX socket created by a process outside the
298 * related Landlock domain (e.g. a parent domain or a non-sandboxed process).302 * related Landlock domain (e.g., a parent domain or a non-sandboxed process).
299 * - %LANDLOCK_SCOPE_SIGNAL: Restrict a sandboxed process from sending a signal303 * - %LANDLOCK_SCOPE_SIGNAL: Restrict a sandboxed process from sending a signal
300 * to another process outside the domain.304 * to another process outside the domain.
301 */305 */