diff options
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 13 | 
1 files changed, 5 insertions, 8 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index 6e1dea93907..ab0e091ce5f 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)   *	to receive an open file descriptor via socket IPC.   *	@file contains the file structure being received.   *	Return 0 if permission is granted. - * - * Security hook for dentry - * - * @dentry_open + * @file_open   *	Save open-time permission checking state for later use upon   *	file_permission, and recheck access if anything has changed   *	since inode_permission. @@ -1498,7 +1495,7 @@ struct security_operations {  	int (*file_send_sigiotask) (struct task_struct *tsk,  				    struct fown_struct *fown, int sig);  	int (*file_receive) (struct file *file); -	int (*dentry_open) (struct file *file, const struct cred *cred); +	int (*file_open) (struct file *file, const struct cred *cred);  	int (*task_create) (unsigned long clone_flags);  	void (*task_free) (struct task_struct *task); @@ -1757,7 +1754,7 @@ int security_file_set_fowner(struct file *file);  int security_file_send_sigiotask(struct task_struct *tsk,  				 struct fown_struct *fown, int sig);  int security_file_receive(struct file *file); -int security_dentry_open(struct file *file, const struct cred *cred); +int security_file_open(struct file *file, const struct cred *cred);  int security_task_create(unsigned long clone_flags);  void security_task_free(struct task_struct *task);  int security_cred_alloc_blank(struct cred *cred, gfp_t gfp); @@ -2228,8 +2225,8 @@ static inline int security_file_receive(struct file *file)  	return 0;  } -static inline int security_dentry_open(struct file *file, -				       const struct cred *cred) +static inline int security_file_open(struct file *file, +				     const struct cred *cred)  {  	return 0;  }  |