diff options
| author | Mickaël Salaün <mic@digikod.net> | 2026-09-24 20:53:56 +0200 |
|---|---|---|
| committer | Mickaël Salaün <mic@digikod.net> | 2026-09-24 21:02:14 +0200 |
| commit | 02619311dbfc4351e78e5dc6652532cbe7603661 (patch) | |
| tree | 794efd8e362c52733c66e25e514a237e2feaeeb4 /include/linux/security.h | |
| parent | 415f2044228cc8b948dc04e079aaa86a4d1aa1d3 (diff) | |
| parent | e26307d83048803274837abf33f65396a88e21ac (diff) | |
| download | linux-next-02619311dbfc4351e78e5dc6652532cbe7603661.tar.gz linux-next-02619311dbfc4351e78e5dc6652532cbe7603661.zip | |
Merge branch 'lsm/dev' into master
Merge the 3 namespace-related LSM and audit patches:
- e26307d83048 ("lsm: add LSM_AUDIT_DATA_NS for namespace audit records")
- f675d2e95569 ("lsm: add LSM blob and hooks for namespaces")
- 4f238e6e1c2c ("ns: Free anonymous mount namespaces via ns_common_free()")
A credential fix precede these commits.
Link: https://lore.kernel.org/r/CAHC9VhSJ3jRybaU=6y2kOKA=KpGE8r=QTMPwdD3KptGcB7msTw@mail.gmail.com
Link: https://lore.kernel.org/r/CAHC9VhQQGcKJU_HF78cMSuCPf=2tj8xW78ELOYwb1xJJU8tuRA@mail.gmail.com
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 153e9043058f..bf002ed14ac8 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -67,6 +67,7 @@ enum fs_value_type; struct watch; struct watch_notification; struct lsm_ctx; +struct nsset; /* Default (no) options for the capable function */ #define CAP_OPT_NONE 0x0 @@ -80,6 +81,7 @@ struct lsm_ctx; struct ctl_table; struct audit_krule; +struct ns_common; struct user_namespace; struct timezone; @@ -540,6 +542,9 @@ int security_task_prctl(int option, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5); void security_task_to_inode(struct task_struct *p, struct inode *inode); int security_create_user_ns(const struct cred *cred); +int security_namespace_init(struct ns_common *ns); +void security_namespace_free(struct ns_common *ns); +int security_namespace_install(const struct nsset *nsset, struct ns_common *ns); int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag); void security_ipc_getlsmprop(struct kern_ipc_perm *ipcp, struct lsm_prop *prop); int security_msg_msg_alloc(struct msg_msg *msg); @@ -1431,6 +1436,21 @@ static inline int security_create_user_ns(const struct cred *cred) return 0; } +static inline int security_namespace_init(struct ns_common *ns) +{ + return 0; +} + +static inline void security_namespace_free(struct ns_common *ns) +{ +} + +static inline int security_namespace_install(const struct nsset *nsset, + struct ns_common *ns) +{ + return 0; +} + static inline int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag) { |