Commit c52b7618 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'work.const-path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull 'struct path' constification update from Al Viro:
 "'struct path' is passed by reference to a bunch of Linux security
  methods; in theory, there's nothing to stop them from modifying the
  damn thing and LSM community being what it is, sooner or later some
  enterprising soul is going to decide that it's a good idea.

  Let's remove the temptation and constify all of those..."

* 'work.const-path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  constify ima_d_path()
  constify security_sb_pivotroot()
  constify security_path_chroot()
  constify security_path_{link,rename}
  apparmor: remove useless checks for NULL ->mnt
  constify security_path_{mkdir,mknod,symlink}
  constify security_path_{unlink,rmdir}
  apparmor: constify common_perm_...()
  apparmor: constify aa_path_link()
  apparmor: new helper - common_path_perm()
  constify chmod_common/security_path_chmod
  constify security_sb_mount()
  constify chown_common/security_path_chown
  tomoyo: constify assorted struct path *
  apparmor_path_truncate(): path->mnt is never NULL
  constify vfs_truncate()
  constify security_path_truncate()
  [apparmor] constify struct path * in a bunch of helpers
parents 681750c0 81cd8896

fs/namei.c

+1 −1
Original line number Diff line number Diff line
@@ -2837,7 +2837,7 @@ static inline int open_to_namei_flags(int flag) 
	return flag;

}



static int may_o_create(struct path *dir, struct dentry *dentry, umode_t mode)

static int may_o_create(const struct path *dir, struct dentry *dentry, umode_t mode)

{

	int error = security_path_mknod(dir, dentry, mode, 0);

	if (error)

fs/open.c

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, 
	return ret;

}



long vfs_truncate(struct path *path, loff_t length)

long vfs_truncate(const struct path *path, loff_t length)

{

	struct inode *inode;

	long error;
@@ -499,7 +499,7 @@ out: 
	return error;

}



static int chmod_common(struct path *path, umode_t mode)

static int chmod_common(const struct path *path, umode_t mode)

{

	struct inode *inode = path->dentry->d_inode;

	struct inode *delegated_inode = NULL;
@@ -564,7 +564,7 @@ SYSCALL_DEFINE2(chmod, const char __user *, filename, umode_t, mode) 
	return sys_fchmodat(AT_FDCWD, filename, mode);

}



static int chown_common(struct path *path, uid_t user, gid_t group)

static int chown_common(const struct path *path, uid_t user, gid_t group)

{

	struct inode *inode = path->dentry->d_inode;

	struct inode *delegated_inode = NULL;

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2293,7 +2293,7 @@ struct filename { 
	const char		iname[];

};



extern long vfs_truncate(struct path *, loff_t);

extern long vfs_truncate(const struct path *, loff_t);

extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,

		       struct file *filp);

extern int vfs_fallocate(struct file *file, int mode, loff_t offset,

include/linux/lsm_hooks.h

+14 −14
Original line number Diff line number Diff line
@@ -1344,10 +1344,10 @@ union security_list_options { 
	int (*sb_kern_mount)(struct super_block *sb, int flags, void *data);

	int (*sb_show_options)(struct seq_file *m, struct super_block *sb);

	int (*sb_statfs)(struct dentry *dentry);

	int (*sb_mount)(const char *dev_name, struct path *path,

	int (*sb_mount)(const char *dev_name, const struct path *path,

			const char *type, unsigned long flags, void *data);

	int (*sb_umount)(struct vfsmount *mnt, int flags);

	int (*sb_pivotroot)(struct path *old_path, struct path *new_path);

	int (*sb_pivotroot)(const struct path *old_path, const struct path *new_path);

	int (*sb_set_mnt_opts)(struct super_block *sb,

				struct security_mnt_opts *opts,

				unsigned long kern_flags,
@@ -1361,23 +1361,23 @@ union security_list_options { 




#ifdef CONFIG_SECURITY_PATH

	int (*path_unlink)(struct path *dir, struct dentry *dentry);

	int (*path_mkdir)(struct path *dir, struct dentry *dentry,

	int (*path_unlink)(const struct path *dir, struct dentry *dentry);

	int (*path_mkdir)(const 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 (*path_rmdir)(const struct path *dir, struct dentry *dentry);

	int (*path_mknod)(const 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,

	int (*path_truncate)(const struct path *path);

	int (*path_symlink)(const struct path *dir, struct dentry *dentry,

				const char *old_name);

	int (*path_link)(struct dentry *old_dentry, struct path *new_dir,

	int (*path_link)(struct dentry *old_dentry, const struct path *new_dir,

				struct dentry *new_dentry);

	int (*path_rename)(struct path *old_dir, struct dentry *old_dentry,

				struct path *new_dir,

	int (*path_rename)(const struct path *old_dir, struct dentry *old_dentry,

				const struct path *new_dir,

				struct dentry *new_dentry);

	int (*path_chmod)(struct path *path, umode_t mode);

	int (*path_chown)(struct path *path, kuid_t uid, kgid_t gid);

	int (*path_chroot)(struct path *path);

	int (*path_chmod)(const struct path *path, umode_t mode);

	int (*path_chown)(const struct path *path, kuid_t uid, kgid_t gid);

	int (*path_chroot)(const struct path *path);

#endif



	int (*inode_alloc_security)(struct inode *inode);

include/linux/security.h

+29 −29
Original line number Diff line number Diff line
@@ -228,10 +228,10 @@ int security_sb_remount(struct super_block *sb, void *data); 
int security_sb_kern_mount(struct super_block *sb, int flags, void *data);

int security_sb_show_options(struct seq_file *m, struct super_block *sb);

int security_sb_statfs(struct dentry *dentry);

int security_sb_mount(const char *dev_name, struct path *path,

int security_sb_mount(const char *dev_name, const struct path *path,

		      const char *type, unsigned long flags, void *data);

int security_sb_umount(struct vfsmount *mnt, int flags);

int security_sb_pivotroot(struct path *old_path, struct path *new_path);

int security_sb_pivotroot(const struct path *old_path, const struct path *new_path);

int security_sb_set_mnt_opts(struct super_block *sb,

				struct security_mnt_opts *opts,

				unsigned long kern_flags,
@@ -544,7 +544,7 @@ static inline int security_sb_statfs(struct dentry *dentry) 
	return 0;

}



static inline int security_sb_mount(const char *dev_name, struct path *path,

static inline int security_sb_mount(const char *dev_name, const struct path *path,

				    const char *type, unsigned long flags,

				    void *data)

{
@@ -556,8 +556,8 @@ static inline int security_sb_umount(struct vfsmount *mnt, int flags) 
	return 0;

}



static inline int security_sb_pivotroot(struct path *old_path,

					struct path *new_path)

static inline int security_sb_pivotroot(const struct path *old_path,

					const struct path *new_path)

{

	return 0;

}
@@ -1456,83 +1456,83 @@ static inline void security_skb_classify_flow(struct sk_buff *skb, struct flowi 
#endif	/* CONFIG_SECURITY_NETWORK_XFRM */



#ifdef CONFIG_SECURITY_PATH

int security_path_unlink(struct path *dir, struct dentry *dentry);

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, umode_t mode,

int security_path_unlink(const struct path *dir, struct dentry *dentry);

int security_path_mkdir(const struct path *dir, struct dentry *dentry, umode_t mode);

int security_path_rmdir(const struct path *dir, struct dentry *dentry);

int security_path_mknod(const 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,

int security_path_truncate(const struct path *path);

int security_path_symlink(const struct path *dir, struct dentry *dentry,

			  const char *old_name);

int security_path_link(struct dentry *old_dentry, struct path *new_dir,

int security_path_link(struct dentry *old_dentry, const 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_rename(const struct path *old_dir, struct dentry *old_dentry,

			 const struct path *new_dir, struct dentry *new_dentry,

			 unsigned int flags);

int security_path_chmod(struct path *path, umode_t mode);

int security_path_chown(struct path *path, kuid_t uid, kgid_t gid);

int security_path_chroot(struct path *path);

int security_path_chmod(const struct path *path, umode_t mode);

int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid);

int security_path_chroot(const struct path *path);

#else	/* CONFIG_SECURITY_PATH */

static inline int security_path_unlink(struct path *dir, struct dentry *dentry)

static inline int security_path_unlink(const struct path *dir, struct dentry *dentry)

{

	return 0;

}



static inline int security_path_mkdir(struct path *dir, struct dentry *dentry,

static inline int security_path_mkdir(const struct path *dir, struct dentry *dentry,

				      umode_t mode)

{

	return 0;

}



static inline int security_path_rmdir(struct path *dir, struct dentry *dentry)

static inline int security_path_rmdir(const struct path *dir, struct dentry *dentry)

{

	return 0;

}



static inline int security_path_mknod(struct path *dir, struct dentry *dentry,

static inline int security_path_mknod(const struct path *dir, struct dentry *dentry,

				      umode_t mode, unsigned int dev)

{

	return 0;

}



static inline int security_path_truncate(struct path *path)

static inline int security_path_truncate(const struct path *path)

{

	return 0;

}



static inline int security_path_symlink(struct path *dir, struct dentry *dentry,

static inline int security_path_symlink(const struct path *dir, struct dentry *dentry,

					const char *old_name)

{

	return 0;

}



static inline int security_path_link(struct dentry *old_dentry,

				     struct path *new_dir,

				     const struct path *new_dir,

				     struct dentry *new_dentry)

{

	return 0;

}



static inline int security_path_rename(struct path *old_dir,

static inline int security_path_rename(const struct path *old_dir,

				       struct dentry *old_dentry,

				       struct path *new_dir,

				       const struct path *new_dir,

				       struct dentry *new_dentry,

				       unsigned int flags)

{

	return 0;

}



static inline int security_path_chmod(struct path *path, umode_t mode)

static inline int security_path_chmod(const struct path *path, umode_t mode)

{

	return 0;

}



static inline int security_path_chown(struct path *path, kuid_t uid, kgid_t gid)

static inline int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)

{

	return 0;

}



static inline int security_path_chroot(struct path *path)

static inline int security_path_chroot(const struct path *path)

{

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE