SELinux: rename dentry_open to file_open

dentry_open takes a file, rename it to file_open

Signed-off-by: Eric Paris <eparis@redhat.com>

8 files changed, 21 insertions, 24 deletions

diff --git a/fs/open.c b/fs/open.c
index 5720854156db..5eccdcea2d1b 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -681,7 +681,7 @@ static struct file *__dentry_open(struct dentry *dentry, struct vfsmount *mnt,
 
         f->f_op = fops_get(inode->i_fop);
 
-        error = security_dentry_open(f, cred);
+        error = security_file_open(f, cred);
         if (error)
                 goto cleanup_all;
 
diff --git a/include/linux/security.h b/include/linux/security.h
index 673afbb8238a..de412ea29aac 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -639,10 +639,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.
@@ -1497,7 +1494,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);
@@ -1756,7 +1753,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);
@@ -2227,8 +2224,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;
 }
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index ad05d391974d..02fddcd4c647 100644
--- a/security/apparmor/lsm.c
+++ b/security/apparmor/lsm.c
@@ -373,7 +373,7 @@ static int apparmor_inode_getattr(struct vfsmount *mnt, struct dentry *dentry)
                                       AA_MAY_META_READ);
 }
 
-static int apparmor_dentry_open(struct file *file, const struct cred *cred)
+static int apparmor_file_open(struct file *file, const struct cred *cred)
 {
         struct aa_file_cxt *fcxt = file->f_security;
         struct aa_profile *profile;
@@ -640,9 +640,9 @@ static struct security_operations apparmor_ops = {
         .path_chmod =                   apparmor_path_chmod,
         .path_chown =                   apparmor_path_chown,
         .path_truncate =                apparmor_path_truncate,
-        .dentry_open =                  apparmor_dentry_open,
         .inode_getattr =                apparmor_inode_getattr,
 
+        .file_open =                    apparmor_file_open,
         .file_permission =              apparmor_file_permission,
         .file_alloc_security =          apparmor_file_alloc_security,
         .file_free_security =           apparmor_file_free_security,
diff --git a/security/capability.c b/security/capability.c
index 5bb21b1c448c..fca889676c5e 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -348,7 +348,7 @@ static int cap_file_receive(struct file *file)
         return 0;
 }
 
-static int cap_dentry_open(struct file *file, const struct cred *cred)
+static int cap_file_open(struct file *file, const struct cred *cred)
 {
         return 0;
 }
@@ -956,7 +956,7 @@ void __init security_fixup_ops(struct security_operations *ops)
         set_to_cap_if_null(ops, file_set_fowner);
         set_to_cap_if_null(ops, file_send_sigiotask);
         set_to_cap_if_null(ops, file_receive);
-        set_to_cap_if_null(ops, dentry_open);
+        set_to_cap_if_null(ops, file_open);
         set_to_cap_if_null(ops, task_create);
         set_to_cap_if_null(ops, task_free);
         set_to_cap_if_null(ops, cred_alloc_blank);
diff --git a/security/security.c b/security/security.c
index bf619ffc9a4d..5497a57fba01 100644
--- a/security/security.c
+++ b/security/security.c
@@ -701,11 +701,11 @@ int security_file_receive(struct file *file)
         return security_ops->file_receive(file);
 }
 
-int security_dentry_open(struct file *file, const struct cred *cred)
+int security_file_open(struct file *file, const struct cred *cred)
 {
         int ret;
 
-        ret = security_ops->dentry_open(file, cred);
+        ret = security_ops->file_open(file, cred);
         if (ret)
                 return ret;
 
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index f7d7e779c7f3..dc15f16a357c 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2973,7 +2973,7 @@ static int selinux_file_permission(struct file *file, int mask)
 
         if (sid == fsec->sid && fsec->isid == isec->sid &&
             fsec->pseqno == avc_policy_seqno())
-                /* No change since dentry_open check. */
+                /* No change since file_open check. */
                 return 0;
 
         return selinux_revalidate_file_permission(file, mask);
@@ -3232,7 +3232,7 @@ static int selinux_file_receive(struct file *file)
         return file_has_perm(cred, file, file_to_av(file));
 }
 
-static int selinux_dentry_open(struct file *file, const struct cred *cred)
+static int selinux_file_open(struct file *file, const struct cred *cred)
 {
         struct file_security_struct *fsec;
         struct inode *inode;
@@ -5596,7 +5596,7 @@ static struct security_operations selinux_ops = {
         .file_send_sigiotask =          selinux_file_send_sigiotask,
         .file_receive =                 selinux_file_receive,
 
-        .dentry_open =                  selinux_dentry_open,
+        .file_open =                    selinux_file_open,
 
         .task_create =                  selinux_task_create,
         .cred_alloc_blank =             selinux_cred_alloc_blank,
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index 81c03a597112..8ef0199ebca1 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1349,7 +1349,7 @@ static int smack_file_receive(struct file *file)
 }
 
 /**
- * smack_dentry_open - Smack dentry open processing
+ * smack_file_open - Smack dentry open processing
  * @file: the object
  * @cred: unused
  *
@@ -1357,7 +1357,7 @@ static int smack_file_receive(struct file *file)
  *
  * Returns 0
  */
-static int smack_dentry_open(struct file *file, const struct cred *cred)
+static int smack_file_open(struct file *file, const struct cred *cred)
 {
         struct inode_smack *isp = file->f_path.dentry->d_inode->i_security;
 
@@ -3538,7 +3538,7 @@ struct security_operations smack_ops = {
         .file_send_sigiotask =          smack_file_send_sigiotask,
         .file_receive =                 smack_file_receive,
 
-        .dentry_open =                  smack_dentry_open,
+        .file_open =                    smack_file_open,
 
         .cred_alloc_blank =             smack_cred_alloc_blank,
         .cred_free =                    smack_cred_free,
diff --git a/security/tomoyo/tomoyo.c b/security/tomoyo/tomoyo.c
index 620d37c159a3..c2d04a50f76a 100644
--- a/security/tomoyo/tomoyo.c
+++ b/security/tomoyo/tomoyo.c
@@ -319,14 +319,14 @@ static int tomoyo_file_fcntl(struct file *file, unsigned int cmd,
 }
 
 /**
- * tomoyo_dentry_open - Target for security_dentry_open().
+ * tomoyo_file_open - Target for security_file_open().
  *
  * @f:    Pointer to "struct file".
  * @cred: Pointer to "struct cred".
  *
  * Returns 0 on success, negative value otherwise.
  */
-static int tomoyo_dentry_open(struct file *f, const struct cred *cred)
+static int tomoyo_file_open(struct file *f, const struct cred *cred)
 {
         int flags = f->f_flags;
         /* Don't check read permission here if called from do_execve(). */
@@ -510,7 +510,7 @@ static struct security_operations tomoyo_security_ops = {
         .bprm_set_creds      = tomoyo_bprm_set_creds,
         .bprm_check_security = tomoyo_bprm_check_security,
         .file_fcntl          = tomoyo_file_fcntl,
-        .dentry_open         = tomoyo_dentry_open,
+        .file_open           = tomoyo_file_open,
         .path_truncate       = tomoyo_path_truncate,
         .path_unlink         = tomoyo_path_unlink,
         .path_mkdir          = tomoyo_path_mkdir,