diff options
author | David Howells <dhowells@redhat.com> | 2008-11-13 18:39:17 -0500 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2008-11-13 18:39:17 -0500 |
commit | f1752eec6145c97163dbce62d17cf5d928e28a27 (patch) | |
tree | 16bc51166d38815092de36a461b845b0b4b522f9 /include/linux/security.h | |
parent | b6dff3ec5e116e3af6f537d4caedcad6b9e5082a (diff) |
CRED: Detach the credentials from task_struct
Detach the credentials from task_struct, duplicating them in copy_process()
and releasing them in __put_task_struct().
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: James Morris <jmorris@namei.org>
Acked-by: Serge Hallyn <serue@us.ibm.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'include/linux/security.h')
-rw-r--r-- | include/linux/security.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 9f305d4a31a7..9239cc11eb9c 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -593,15 +593,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) | |||
593 | * manual page for definitions of the @clone_flags. | 593 | * manual page for definitions of the @clone_flags. |
594 | * @clone_flags contains the flags indicating what should be shared. | 594 | * @clone_flags contains the flags indicating what should be shared. |
595 | * Return 0 if permission is granted. | 595 | * Return 0 if permission is granted. |
596 | * @task_alloc_security: | 596 | * @cred_alloc_security: |
597 | * @p contains the task_struct for child process. | 597 | * @cred contains the cred struct for child process. |
598 | * Allocate and attach a security structure to the p->security field. The | 598 | * Allocate and attach a security structure to the cred->security field. |
599 | * security field is initialized to NULL when the task structure is | 599 | * The security field is initialized to NULL when the task structure is |
600 | * allocated. | 600 | * allocated. |
601 | * Return 0 if operation was successful. | 601 | * Return 0 if operation was successful. |
602 | * @task_free_security: | 602 | * @cred_free: |
603 | * @p contains the task_struct for process. | 603 | * @cred points to the credentials. |
604 | * Deallocate and clear the p->security field. | 604 | * Deallocate and clear the cred->security field in a set of credentials. |
605 | * @task_setuid: | 605 | * @task_setuid: |
606 | * Check permission before setting one or more of the user identity | 606 | * Check permission before setting one or more of the user identity |
607 | * attributes of the current process. The @flags parameter indicates | 607 | * attributes of the current process. The @flags parameter indicates |
@@ -1405,8 +1405,8 @@ struct security_operations { | |||
1405 | int (*dentry_open) (struct file *file); | 1405 | int (*dentry_open) (struct file *file); |
1406 | 1406 | ||
1407 | int (*task_create) (unsigned long clone_flags); | 1407 | int (*task_create) (unsigned long clone_flags); |
1408 | int (*task_alloc_security) (struct task_struct *p); | 1408 | int (*cred_alloc_security) (struct cred *cred); |
1409 | void (*task_free_security) (struct task_struct *p); | 1409 | void (*cred_free) (struct cred *cred); |
1410 | int (*task_setuid) (uid_t id0, uid_t id1, uid_t id2, int flags); | 1410 | int (*task_setuid) (uid_t id0, uid_t id1, uid_t id2, int flags); |
1411 | int (*task_post_setuid) (uid_t old_ruid /* or fsuid */ , | 1411 | int (*task_post_setuid) (uid_t old_ruid /* or fsuid */ , |
1412 | uid_t old_euid, uid_t old_suid, int flags); | 1412 | uid_t old_euid, uid_t old_suid, int flags); |
@@ -1660,8 +1660,8 @@ int security_file_send_sigiotask(struct task_struct *tsk, | |||
1660 | int security_file_receive(struct file *file); | 1660 | int security_file_receive(struct file *file); |
1661 | int security_dentry_open(struct file *file); | 1661 | int security_dentry_open(struct file *file); |
1662 | int security_task_create(unsigned long clone_flags); | 1662 | int security_task_create(unsigned long clone_flags); |
1663 | int security_task_alloc(struct task_struct *p); | 1663 | int security_cred_alloc(struct cred *cred); |
1664 | void security_task_free(struct task_struct *p); | 1664 | void security_cred_free(struct cred *cred); |
1665 | int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags); | 1665 | int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, int flags); |
1666 | int security_task_post_setuid(uid_t old_ruid, uid_t old_euid, | 1666 | int security_task_post_setuid(uid_t old_ruid, uid_t old_euid, |
1667 | uid_t old_suid, int flags); | 1667 | uid_t old_suid, int flags); |
@@ -2181,12 +2181,12 @@ static inline int security_task_create(unsigned long clone_flags) | |||
2181 | return 0; | 2181 | return 0; |
2182 | } | 2182 | } |
2183 | 2183 | ||
2184 | static inline int security_task_alloc(struct task_struct *p) | 2184 | static inline int security_cred_alloc(struct cred *cred) |
2185 | { | 2185 | { |
2186 | return 0; | 2186 | return 0; |
2187 | } | 2187 | } |
2188 | 2188 | ||
2189 | static inline void security_task_free(struct task_struct *p) | 2189 | static inline void security_cred_free(struct cred *cred) |
2190 | { } | 2190 | { } |
2191 | 2191 | ||
2192 | static inline int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, | 2192 | static inline int security_task_setuid(uid_t id0, uid_t id1, uid_t id2, |