Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security

[firefly-linux-kernel-4.4.55.git] / include / linux / security.h

diff --git a/include/linux/security.h b/include/linux/security.h
index dd5bbe88d6ee33fe61c77613f34bb4f765cf2107..0ccceb9b104640f91e9738c7b467e0da1a74c7b8 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -186,7 +186,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  * Security module identifier.
  *
  * @name:
- *     A string that acts as a unique identifeir for the LSM with max number
+ *     A string that acts as a unique identifier for the LSM with max number
  *     of characters = SECURITY_NAME_MAX.
  *
  * Security hooks for program execution operations.
@@ -275,7 +275,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *     @copy copied data which will be passed to the security module.
  *     Returns 0 if the copy was successful.
  * @sb_remount:
- *     Extracts security system specifc mount options and verifys no changes
+ *     Extracts security system specific mount options and verifies no changes
  *     are being made to those options.
  *     @sb superblock being remounted
  *     @data contains the filesystem-specific data.
@@ -380,15 +380,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *     Return 0 if permission is granted.
  * @inode_mkdir:
  *     Check permissions to create a new directory in the existing directory
- *     associated with inode strcture @dir.
- *     @dir containst the inode structure of parent of the directory to be created.
+ *     associated with inode structure @dir.
+ *     @dir contains the inode structure of parent of the directory to be created.
  *     @dentry contains the dentry structure of new directory.
  *     @mode contains the mode of new directory.
  *     Return 0 if permission is granted.
  * @path_mkdir:
  *     Check permissions to create a new directory in the existing directory
- *     associated with path strcture @path.
- *     @dir containst the path structure of parent of the directory
+ *     associated with path structure @path.
+ *     @dir contains the path structure of parent of the directory
  *     to be created.
  *     @dentry contains the dentry structure of new directory.
  *     @mode contains the mode of new directory.
@@ -578,7 +578,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *     @file contains the file structure.
  *     @cmd contains the operation to perform.
  *     @arg contains the operational arguments.
- *     Check permission for an ioctl operation on @file.  Note that @arg can
+ *     Check permission for an ioctl operation on @file.  Note that @arg
  *     sometimes represents a user space pointer; in other cases, it may be a
  *     simple integer value.  When @arg represents a user space pointer, it
  *     should never be used by the security module.
@@ -608,7 +608,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *     Return 0 if permission is granted.
  * @file_fcntl:
  *     Check permission before allowing the file operation specified by @cmd
- *     from being performed on the file @file.  Note that @arg can sometimes
+ *     from being performed on the file @file.  Note that @arg sometimes
  *     represents a user space pointer; in other cases, it may be a simple
  *     integer value.  When @arg represents a user space pointer, it should
  *     never be used by the security module.
@@ -795,7 +795,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *     information can be saved using the eff_cap field of the
  *     netlink_skb_parms structure.  Also may be used to provide fine
  *     grained control over message transmission.
- *     @sk associated sock of task sending the message.,
+ *     @sk associated sock of task sending the message.
  *     @skb contains the sk_buff structure for the netlink message.
  *     Return 0 if the information was successfully saved and message
  *     is allowed to be transmitted.
@@ -1082,9 +1082,9 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *     should free it.
  *     @key points to the key to be queried.
  *     @_buffer points to a pointer that should be set to point to the
- *      resulting string (if no label or an error occurs).
+ *     resulting string (if no label or an error occurs).
  *     Return the length of the string (including terminating NUL) or -ve if
- *      an error.
+ *     an error.
  *     May also return 0 (and a NULL buffer pointer) if there is no label.
  *
  * Security hooks affecting all System V IPC operations.
@@ -1270,7 +1270,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *     credentials.
  *     @tsk contains the task_struct for the process.
  *     @cred contains the credentials to use.
- *      @ns contains the user namespace we want the capability in
+ *     @ns contains the user namespace we want the capability in
  *     @cap contains the capability <include/linux/capability.h>.
  *     @audit: Whether to write an audit message or not
  *     Return 0 if the capability is granted for @tsk.
@@ -1372,7 +1372,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
  *     @ctxlen contains the length of @ctx.
  *
  * @inode_getsecctx:
- *     Returns a string containing all relavent security context information
+ *     Returns a string containing all relevant security context information
  *
  *     @inode we wish to get the security context of.
  *     @ctx is a pointer in which to place the allocated security context.
@@ -1426,9 +1426,9 @@ struct security_operations {
 
 #ifdef CONFIG_SECURITY_PATH
        int (*path_unlink) (struct path *dir, struct dentry *dentry);
-       int (*path_mkdir) (struct path *dir, struct dentry *dentry, int mode);
+       int (*path_mkdir) (struct path *dir, struct dentry *dentry, umode_t mode);
        int (*path_rmdir) (struct path *dir, struct dentry *dentry);
-       int (*path_mknod) (struct path *dir, struct dentry *dentry, int mode,
+       int (*path_mknod) (struct path *dir, struct dentry *dentry, umode_t mode,
                           unsigned int dev);
        int (*path_truncate) (struct path *path);
        int (*path_symlink) (struct path *dir, struct dentry *dentry,
@@ -1437,8 +1437,7 @@ struct security_operations {
                          struct dentry *new_dentry);
        int (*path_rename) (struct path *old_dir, struct dentry *old_dentry,
                            struct path *new_dir, struct dentry *new_dentry);
-       int (*path_chmod) (struct dentry *dentry, struct vfsmount *mnt,
-                          mode_t mode);
+       int (*path_chmod) (struct path *path, umode_t mode);
        int (*path_chown) (struct path *path, uid_t uid, gid_t gid);
        int (*path_chroot) (struct path *path);
 #endif
@@ -1449,16 +1448,16 @@ struct security_operations {
                                    const struct qstr *qstr, char **name,
                                    void **value, size_t *len);
        int (*inode_create) (struct inode *dir,
-                            struct dentry *dentry, int mode);
+                            struct dentry *dentry, umode_t mode);
        int (*inode_link) (struct dentry *old_dentry,
                           struct inode *dir, struct dentry *new_dentry);
        int (*inode_unlink) (struct inode *dir, struct dentry *dentry);
        int (*inode_symlink) (struct inode *dir,
                              struct dentry *dentry, const char *old_name);
-       int (*inode_mkdir) (struct inode *dir, struct dentry *dentry, int mode);
+       int (*inode_mkdir) (struct inode *dir, struct dentry *dentry, umode_t mode);
        int (*inode_rmdir) (struct inode *dir, struct dentry *dentry);
        int (*inode_mknod) (struct inode *dir, struct dentry *dentry,
-                           int mode, dev_t dev);
+                           umode_t mode, dev_t dev);
        int (*inode_rename) (struct inode *old_dir, struct dentry *old_dentry,
                             struct inode *new_dir, struct dentry *new_dentry);
        int (*inode_readlink) (struct dentry *dentry);
@@ -1718,15 +1717,15 @@ int security_inode_init_security(struct inode *inode, struct inode *dir,
 int security_old_inode_init_security(struct inode *inode, struct inode *dir,
                                     const struct qstr *qstr, char **name,
                                     void **value, size_t *len);
-int security_inode_create(struct inode *dir, struct dentry *dentry, int mode);
+int security_inode_create(struct inode *dir, struct dentry *dentry, umode_t mode);
 int security_inode_link(struct dentry *old_dentry, struct inode *dir,
                         struct dentry *new_dentry);
 int security_inode_unlink(struct inode *dir, struct dentry *dentry);
 int security_inode_symlink(struct inode *dir, struct dentry *dentry,
                           const char *old_name);
-int security_inode_mkdir(struct inode *dir, struct dentry *dentry, int mode);
+int security_inode_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode);
 int security_inode_rmdir(struct inode *dir, struct dentry *dentry);
-int security_inode_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev);
+int security_inode_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev);
 int security_inode_rename(struct inode *old_dir, struct dentry *old_dentry,
                          struct inode *new_dir, struct dentry *new_dentry);
 int security_inode_readlink(struct dentry *dentry);
@@ -2063,7 +2062,7 @@ static inline int security_old_inode_init_security(struct inode *inode,
 
 static inline int security_inode_create(struct inode *dir,
                                         struct dentry *dentry,
-                                        int mode)
+                                        umode_t mode)
 {
        return 0;
 }
@@ -2857,9 +2856,9 @@ static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi
 
 #ifdef CONFIG_SECURITY_PATH
 int security_path_unlink(struct path *dir, struct dentry *dentry);
-int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode);
+int security_path_mkdir(struct path *dir, struct dentry *dentry, umode_t mode);
 int security_path_rmdir(struct path *dir, struct dentry *dentry);
-int security_path_mknod(struct path *dir, struct dentry *dentry, int mode,
+int security_path_mknod(struct path *dir, struct dentry *dentry, umode_t mode,
                        unsigned int dev);
 int security_path_truncate(struct path *path);
 int security_path_symlink(struct path *dir, struct dentry *dentry,
@@ -2868,8 +2867,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
                       struct dentry *new_dentry);
 int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
                         struct path *new_dir, struct dentry *new_dentry);
-int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
-                       mode_t mode);
+int security_path_chmod(struct path *path, umode_t mode);
 int security_path_chown(struct path *path, uid_t uid, gid_t gid);
 int security_path_chroot(struct path *path);
 #else  /* CONFIG_SECURITY_PATH */
@@ -2879,7 +2877,7 @@ static inline int security_path_unlink(struct path *dir, struct dentry *dentry)
 }
 
 static inline int security_path_mkdir(struct path *dir, struct dentry *dentry,
-                                     int mode)
+                                     umode_t mode)
 {
        return 0;
 }
@@ -2890,7 +2888,7 @@ static inline int security_path_rmdir(struct path *dir, struct dentry *dentry)
 }
 
 static inline int security_path_mknod(struct path *dir, struct dentry *dentry,
-                                     int mode, unsigned int dev)
+                                     umode_t mode, unsigned int dev)
 {
        return 0;
 }
@@ -2921,9 +2919,7 @@ static inline int security_path_rename(struct path *old_dir,
        return 0;
 }
 
-static inline int security_path_chmod(struct dentry *dentry,
-                                     struct vfsmount *mnt,
-                                     mode_t mode)
+static inline int security_path_chmod(struct path *path, umode_t mode)
 {
        return 0;
 }
@@ -3012,7 +3008,7 @@ static inline void security_audit_rule_free(void *lsmrule)
 
 #ifdef CONFIG_SECURITYFS
 
-extern struct dentry *securityfs_create_file(const char *name, mode_t mode,
+extern struct dentry *securityfs_create_file(const char *name, umode_t mode,
                                             struct dentry *parent, void *data,
                                             const struct file_operations *fops);
 extern struct dentry *securityfs_create_dir(const char *name, struct dentry *parent);
@@ -3027,7 +3023,7 @@ static inline struct dentry *securityfs_create_dir(const char *name,
 }
 
 static inline struct dentry *securityfs_create_file(const char *name,
-                                                   mode_t mode,
+                                                   umode_t mode,
                                                    struct dentry *parent,
                                                    void *data,
                                                    const struct file_operations *fops)