Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fa8e0a1 authored by Jan Kara's avatar Jan Kara Committed by Al Viro
Browse files

fs: Rename file_remove_suid() to file_remove_privs() 



file_remove_suid() is a misnomer since it removes also file capabilities
stored in xattrs and sets S_NOSEC flag. Also should_remove_suid() tells
something else than whether file_remove_suid() call is necessary which
leads to bugs.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 2426f391

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1748,7 +1748,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb, 
	}



	current->backing_dev_info = inode_to_bdi(inode);

	err = file_remove_suid(file);

	err = file_remove_privs(file);

	if (err) {

		mutex_unlock(&inode->i_mutex);

		goto out;

fs/ceph/file.c

+1 −1
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ static ssize_t ceph_write_iter(struct kiocb *iocb, struct iov_iter *from) 


	pos = iocb->ki_pos;

	count = iov_iter_count(from);

	err = file_remove_suid(file);

	err = file_remove_privs(file);

	if (err)

		goto out;

fs/fuse/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ static ssize_t fuse_file_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	if (err <= 0)

		goto out;



	err = file_remove_suid(file);

	err = file_remove_privs(file);

	if (err)

		goto out;

fs/inode.c

+8 −5
Original line number Diff line number Diff line
@@ -1685,7 +1685,11 @@ static int __remove_suid(struct dentry *dentry, int kill) 
	return notify_change(dentry, &newattrs, NULL);

}



int file_remove_suid(struct file *file)

/*

 * Remove special file priviledges (suid, capabilities) when file is written

 * to or truncated.

 */

int file_remove_privs(struct file *file)

{

	struct dentry *dentry = file->f_path.dentry;

	struct inode *inode = d_inode(dentry);
@@ -1711,7 +1715,7 @@ int file_remove_suid(struct file *file) 


	return error;

}

EXPORT_SYMBOL(file_remove_suid);

EXPORT_SYMBOL(file_remove_privs);



/**

 *	file_update_time	-	update mtime and ctime time
@@ -1966,9 +1970,8 @@ EXPORT_SYMBOL(inode_dio_wait); 
 * inode is being instantiated).  The reason for the cmpxchg() loop

 * --- which wouldn't be necessary if all code paths which modify

 * i_flags actually followed this rule, is that there is at least one

 * code path which doesn't today --- for example,

 * __generic_file_aio_write() calls file_remove_suid() without holding

 * i_mutex --- so we use cmpxchg() out of an abundance of caution.

 * code path which doesn't today so we use cmpxchg() out of an abundance

 * of caution.

 *

 * In the long run, i_mutex is overkill, and we should probably look

 * at using the i_lock spinlock to protect i_flags, and then make sure

fs/ntfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static ssize_t ntfs_prepare_file_for_write(struct kiocb *iocb, 
	base_ni = ni;

	if (NInoAttr(ni))

		base_ni = ni->ext.base_ntfs_ino;

	err = file_remove_suid(file);

	err = file_remove_privs(file);

	if (unlikely(err))

		goto out;

	/*