aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/security.h
diff options
context:
space:
mode:
authorJames Morris <james.l.morris@oracle.com>2012-05-21 21:21:06 -0400
committerJames Morris <james.l.morris@oracle.com>2012-05-21 21:21:06 -0400
commitff2bb047c4bce9742e94911eeb44b4d6ff4734ab (patch)
tree9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f /include/linux/security.h
parentcffee16e8b997ab947de661e8820e486b0830c94 (diff)
parentc737f8284cac91428f8fcc8281e69117fa16e887 (diff)
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
Per pull request, for 3.5.
Diffstat (limited to 'include/linux/security.h')
-rw-r--r--include/linux/security.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/include/linux/security.h b/include/linux/security.h
index 6e1dea93907a..ab0e091ce5fa 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -640,10 +640,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
640 * to receive an open file descriptor via socket IPC. 640 * to receive an open file descriptor via socket IPC.
641 * @file contains the file structure being received. 641 * @file contains the file structure being received.
642 * Return 0 if permission is granted. 642 * Return 0 if permission is granted.
643 * 643 * @file_open
644 * Security hook for dentry
645 *
646 * @dentry_open
647 * Save open-time permission checking state for later use upon 644 * Save open-time permission checking state for later use upon
648 * file_permission, and recheck access if anything has changed 645 * file_permission, and recheck access if anything has changed
649 * since inode_permission. 646 * since inode_permission.
@@ -1498,7 +1495,7 @@ struct security_operations {
1498 int (*file_send_sigiotask) (struct task_struct *tsk, 1495 int (*file_send_sigiotask) (struct task_struct *tsk,
1499 struct fown_struct *fown, int sig); 1496 struct fown_struct *fown, int sig);
1500 int (*file_receive) (struct file *file); 1497 int (*file_receive) (struct file *file);
1501 int (*dentry_open) (struct file *file, const struct cred *cred); 1498 int (*file_open) (struct file *file, const struct cred *cred);
1502 1499
1503 int (*task_create) (unsigned long clone_flags); 1500 int (*task_create) (unsigned long clone_flags);
1504 void (*task_free) (struct task_struct *task); 1501 void (*task_free) (struct task_struct *task);
@@ -1757,7 +1754,7 @@ int security_file_set_fowner(struct file *file);
1757int security_file_send_sigiotask(struct task_struct *tsk, 1754int security_file_send_sigiotask(struct task_struct *tsk,
1758 struct fown_struct *fown, int sig); 1755 struct fown_struct *fown, int sig);
1759int security_file_receive(struct file *file); 1756int security_file_receive(struct file *file);
1760int security_dentry_open(struct file *file, const struct cred *cred); 1757int security_file_open(struct file *file, const struct cred *cred);
1761int security_task_create(unsigned long clone_flags); 1758int security_task_create(unsigned long clone_flags);
1762void security_task_free(struct task_struct *task); 1759void security_task_free(struct task_struct *task);
1763int security_cred_alloc_blank(struct cred *cred, gfp_t gfp); 1760int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
@@ -2228,8 +2225,8 @@ static inline int security_file_receive(struct file *file)
2228 return 0; 2225 return 0;
2229} 2226}
2230 2227
2231static inline int security_dentry_open(struct file *file, 2228static inline int security_file_open(struct file *file,
2232 const struct cred *cred) 2229 const struct cred *cred)
2233{ 2230{
2234 return 0; 2231 return 0;
2235} 2232}