switch security_path_chmod() to umode_t (910f4ece) · Commits · jan.koester / Linux

include/linux/security.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1436,7 +1436,7 @@ struct security_operations {
	int (path_rename) (struct path old_dir, struct dentry *old_dentry,		int (path_rename) (struct path old_dir, struct dentry *old_dentry,
	struct path new_dir, struct dentry new_dentry);		struct path new_dir, struct dentry new_dentry);
	int (path_chmod) (struct dentry dentry, struct vfsmount *mnt,		int (path_chmod) (struct dentry dentry, struct vfsmount *mnt,
	mode_t mode);		umode_t mode);
	int (path_chown) (struct path path, uid_t uid, gid_t gid);		int (path_chown) (struct path path, uid_t uid, gid_t gid);
	int (path_chroot) (struct path path);		int (path_chroot) (struct path path);
	#endif		#endif
	@@ -2867,7 +2867,7 @@ int security_path_link(struct dentry old_dentry, struct path new_dir,
	int security_path_rename(struct path old_dir, struct dentry old_dentry,		int security_path_rename(struct path old_dir, struct dentry old_dentry,
	struct path new_dir, struct dentry new_dentry);		struct path new_dir, struct dentry new_dentry);
	int security_path_chmod(struct dentry dentry, struct vfsmount mnt,		int security_path_chmod(struct dentry dentry, struct vfsmount mnt,
	mode_t mode);		umode_t mode);
	int security_path_chown(struct path *path, uid_t uid, gid_t gid);		int security_path_chown(struct path *path, uid_t uid, gid_t gid);
	int security_path_chroot(struct path *path);		int security_path_chroot(struct path *path);
	#else /* CONFIG_SECURITY_PATH */		#else /* CONFIG_SECURITY_PATH */
	@@ -2921,7 +2921,7 @@ static inline int security_path_rename(struct path *old_dir,

	static inline int security_path_chmod(struct dentry *dentry,		static inline int security_path_chmod(struct dentry *dentry,
	struct vfsmount *mnt,		struct vfsmount *mnt,
	mode_t mode)		umode_t mode)
	{		{
	return 0;		return 0;
	}		}

security/apparmor/lsm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -345,7 +345,7 @@ static int apparmor_path_rename(struct path old_dir, struct dentry old_dentry,
	}		}

	static int apparmor_path_chmod(struct dentry dentry, struct vfsmount mnt,		static int apparmor_path_chmod(struct dentry dentry, struct vfsmount mnt,
	mode_t mode)		umode_t mode)
	{		{
	if (!mediated_filesystem(dentry->d_inode))		if (!mediated_filesystem(dentry->d_inode))
	return 0;		return 0;

security/capability.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -280,7 +280,7 @@ static int cap_path_truncate(struct path *path)
	}		}

	static int cap_path_chmod(struct dentry dentry, struct vfsmount mnt,		static int cap_path_chmod(struct dentry dentry, struct vfsmount mnt,
	mode_t mode)		umode_t mode)
	{		{
	return 0;		return 0;
	}		}

security/security.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -455,7 +455,7 @@ int security_path_truncate(struct path *path)
	}		}

	int security_path_chmod(struct dentry dentry, struct vfsmount mnt,		int security_path_chmod(struct dentry dentry, struct vfsmount mnt,
	mode_t mode)		umode_t mode)
	{		{
	if (unlikely(IS_PRIVATE(dentry->d_inode)))		if (unlikely(IS_PRIVATE(dentry->d_inode)))
	return 0;		return 0;

security/tomoyo/tomoyo.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -360,7 +360,7 @@ static int tomoyo_file_ioctl(struct file *file, unsigned int cmd,
	* Returns 0 on success, negative value otherwise.		* Returns 0 on success, negative value otherwise.
	*/		*/
	static int tomoyo_path_chmod(struct dentry dentry, struct vfsmount mnt,		static int tomoyo_path_chmod(struct dentry dentry, struct vfsmount mnt,
	mode_t mode)		umode_t mode)
	{		{
	struct path path = { mnt, dentry };		struct path path = { mnt, dentry };
	return tomoyo_path_number_perm(TOMOYO_TYPE_CHMOD, &path,		return tomoyo_path_number_perm(TOMOYO_TYPE_CHMOD, &path,