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

Merge branch 'work.inode-type-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs inode type handling updates from Al Viro:
 "We should never change the type bits of ->i_mode or the method tables
  (->i_op and ->i_fop) of a live inode.

  Unfortunately, not all filesystems took care to prevent that"

* 'work.inode-type-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  spufs: fix bogosity in S_ISGID handling
  9p: missing chunk of "fs/9p: Don't update file type when updating file attributes"
  openpromfs: don't do unlock_new_inode() until the new inode is set up
  hostfs_mknod(): don't bother with init_special_inode()
  cifs: have cifs_fattr_to_inode() refuse to change type on live inode
  cifs: have ->mkdir() handle race with another client sanely
  do_cifs_create(): don't set ->i_mode of something we had not created
  gfs2: be careful with inode refresh
  ocfs2_inode_lock_update(): make sure we don't change the type bits of i_mode
  orangefs_inode_is_stale(): i_mode type bits do *not* form a bitmap...
  vboxsf: don't allow to change the inode type
  afs: Fix updating of i_mode due to 3rd party change
  ceph: don't allow type or device number to change on non-I_NEW inodes
  ceph: fix up error handling with snapdirs
  new helper: inode_wrong_type()
parents 57fa2369 c4ab036a

arch/powerpc/platforms/cell/spufs/inode.c

+2 −8
Original line number Diff line number Diff line
@@ -236,10 +236,7 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags, 
	if (!inode)

		return -ENOSPC;



	if (dir->i_mode & S_ISGID) {

		inode->i_gid = dir->i_gid;

		inode->i_mode &= S_ISGID;

	}

	inode_init_owner(&init_user_ns, inode, dir, mode | S_IFDIR);

	ctx = alloc_spu_context(SPUFS_I(dir)->i_gang); /* XXX gang */

	SPUFS_I(inode)->i_ctx = ctx;

	if (!ctx) {
@@ -470,10 +467,7 @@ spufs_mkgang(struct inode *dir, struct dentry *dentry, umode_t mode) 
		goto out;



	ret = 0;

	if (dir->i_mode & S_ISGID) {

		inode->i_gid = dir->i_gid;

		inode->i_mode &= S_ISGID;

	}

	inode_init_owner(&init_user_ns, inode, dir, mode | S_IFDIR);

	gang = alloc_spu_gang();

	SPUFS_I(inode)->i_ctx = NULL;

	SPUFS_I(inode)->i_gang = gang;

fs/9p/vfs_inode.c

+2 −2
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static int v9fs_test_inode(struct inode *inode, void *data) 


	umode = p9mode2unixmode(v9ses, st, &rdev);

	/* don't match inode of different type */

	if ((inode->i_mode & S_IFMT) != (umode & S_IFMT))

	if (inode_wrong_type(inode, umode))

		return 0;



	/* compare qid details */
@@ -1390,7 +1390,7 @@ int v9fs_refresh_inode(struct p9_fid *fid, struct inode *inode) 
	 * Don't update inode if the file type is different

	 */

	umode = p9mode2unixmode(v9ses, st, &rdev);

	if ((inode->i_mode & S_IFMT) != (umode & S_IFMT))

	if (inode_wrong_type(inode, umode))

		goto out;



	/*

fs/9p/vfs_inode_dotl.c

+5 −9
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int v9fs_test_inode_dotl(struct inode *inode, void *data) 
	struct p9_stat_dotl *st = (struct p9_stat_dotl *)data;



	/* don't match inode of different type */

	if ((inode->i_mode & S_IFMT) != (st->st_mode & S_IFMT))

	if (inode_wrong_type(inode, st->st_mode))

		return 0;



	if (inode->i_generation != st->st_gen)
@@ -663,14 +663,10 @@ v9fs_stat2inode_dotl(struct p9_stat_dotl *stat, struct inode *inode, 
		if (stat->st_result_mask & P9_STATS_NLINK)

			set_nlink(inode, stat->st_nlink);

		if (stat->st_result_mask & P9_STATS_MODE) {

			inode->i_mode = stat->st_mode;

			if ((S_ISBLK(inode->i_mode)) ||

						(S_ISCHR(inode->i_mode)))

				init_special_inode(inode, inode->i_mode,

								inode->i_rdev);

		}

		if (stat->st_result_mask & P9_STATS_RDEV)

			inode->i_rdev = new_decode_dev(stat->st_rdev);

			mode = stat->st_mode & S_IALLUGO;

			mode |= inode->i_mode & ~S_IALLUGO;

			inode->i_mode = mode;

		}

		if (!(flags & V9FS_STAT2INODE_KEEP_ISIZE) &&

		    stat->st_result_mask & P9_STATS_SIZE)

			v9fs_i_size_write(inode, stat->st_size);
@@ -959,7 +955,7 @@ int v9fs_refresh_inode_dotl(struct p9_fid *fid, struct inode *inode) 
	/*

	 * Don't update inode if the file type is different

	 */

	if ((inode->i_mode & S_IFMT) != (st->st_mode & S_IFMT))

	if (inode_wrong_type(inode, st->st_mode))

		goto out;



	/*

fs/afs/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -102,13 +102,13 @@ static int afs_inode_init_from_status(struct afs_operation *op, 


	switch (status->type) {

	case AFS_FTYPE_FILE:

		inode->i_mode	= S_IFREG | status->mode;

		inode->i_mode	= S_IFREG | (status->mode & S_IALLUGO);

		inode->i_op	= &afs_file_inode_operations;

		inode->i_fop	= &afs_file_operations;

		inode->i_mapping->a_ops	= &afs_fs_aops;

		break;

	case AFS_FTYPE_DIR:

		inode->i_mode	= S_IFDIR | status->mode;

		inode->i_mode	= S_IFDIR |  (status->mode & S_IALLUGO);

		inode->i_op	= &afs_dir_inode_operations;

		inode->i_fop	= &afs_dir_file_operations;

		inode->i_mapping->a_ops	= &afs_dir_aops;
@@ -198,7 +198,7 @@ static void afs_apply_status(struct afs_operation *op, 
	if (status->mode != vnode->status.mode) {

		mode = inode->i_mode;

		mode &= ~S_IALLUGO;

		mode |= status->mode;

		mode |= status->mode & S_IALLUGO;

		WRITE_ONCE(inode->i_mode, mode);

	}

fs/ceph/caps.c

+7 −1
Original line number Diff line number Diff line
@@ -3358,7 +3358,13 @@ static void handle_cap_grant(struct inode *inode, 


	if ((newcaps & CEPH_CAP_AUTH_SHARED) &&

	    (extra_info->issued & CEPH_CAP_AUTH_EXCL) == 0) {

		inode->i_mode = le32_to_cpu(grant->mode);

		umode_t mode = le32_to_cpu(grant->mode);



		if (inode_wrong_type(inode, mode))

			pr_warn_once("inode type changed! (ino %llx.%llx is 0%o, mds says 0%o)\n",

				     ceph_vinop(inode), inode->i_mode, mode);

		else

			inode->i_mode = mode;

		inode->i_uid = make_kuid(&init_user_ns, le32_to_cpu(grant->uid));

		inode->i_gid = make_kgid(&init_user_ns, le32_to_cpu(grant->gid));

		ci->i_btime = extra_info->btime;