android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: vfs: Add setattr2 for filesystems with per mount permissions"

Browse Source 
This reverts commit 044366659c as it is no
longer needed that sdcardfs is removed.

Bug: 157700134
Cc: Daniel Rosenberg <drosen@google.com>
Cc: Yongqin Liu <yongqin.liu@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I721aa74cca4afccd7628ef3728d5fbfc43050e9e
This commit is contained in:
Greg Kroah-Hartman 2020-05-29 11:20:55 +02:00
parent 750140e3c4
commit 04acc4cf60
7 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/attr.c
View File

@ -220,7 +220,7 @@ EXPORT_SYMBOL(setattr_copy);
* the file open for write, as there can be no conflicting delegation in * the file open for write, as there can be no conflicting delegation in
* that case. * that case.
*/ */
int notify_change2(struct vfsmount *mnt, struct dentry * dentry, struct iattr * attr, struct inode **delegated_inode) int notify_change(struct dentry * dentry, struct iattr * attr, struct inode **delegated_inode)
{ {
struct inode *inode = dentry->d_inode; struct inode *inode = dentry->d_inode;
umode_t mode = inode->i_mode; umode_t mode = inode->i_mode;
@ -332,9 +332,7 @@ int notify_change2(struct vfsmount *mnt, struct dentry * dentry, struct iattr *
if (error) if (error)
return error; return error;
if (mnt && inode->i_op->setattr2) if (inode->i_op->setattr)
error = inode->i_op->setattr2(mnt, dentry, attr);
else if (inode->i_op->setattr)
error = inode->i_op->setattr(dentry, attr); error = inode->i_op->setattr(dentry, attr);
else else
error = simple_setattr(dentry, attr); error = simple_setattr(dentry, attr);
@ -347,10 +345,4 @@ int notify_change2(struct vfsmount *mnt, struct dentry * dentry, struct iattr *
return error; return error;
} }
EXPORT_SYMBOL_GPL(notify_change2);
int notify_change(struct dentry * dentry, struct iattr * attr, struct inode **delegated_inode)
{
return notify_change2(NULL, dentry, attr, delegated_inode);
}
EXPORT_SYMBOL(notify_change); EXPORT_SYMBOL(notify_change);

2
fs/coredump.c
View File

@ -777,7 +777,7 @@ void do_coredump(const kernel_siginfo_t *siginfo)
goto close_fail; goto close_fail;
if (!(cprm.file->f_mode & FMODE_CAN_WRITE)) if (!(cprm.file->f_mode & FMODE_CAN_WRITE))
goto close_fail; goto close_fail;
if (do_truncate2(cprm.file->f_path.mnt, cprm.file->f_path.dentry, 0, 0, cprm.file)) if (do_truncate(cprm.file->f_path.dentry, 0, 0, cprm.file))
goto close_fail; goto close_fail;
} }

6
fs/inode.c
View File

@ -1819,7 +1819,7 @@ int dentry_needs_remove_privs(struct dentry *dentry)
return mask; return mask;
} }
static int __remove_privs(struct vfsmount *mnt, struct dentry *dentry, int kill) static int __remove_privs(struct dentry *dentry, int kill)
{ {
struct iattr newattrs; struct iattr newattrs;
@ -1828,7 +1828,7 @@ static int __remove_privs(struct vfsmount *mnt, struct dentry *dentry, int kill)
* Note we call this on write, so notify_change will not * Note we call this on write, so notify_change will not
* encounter any conflicting delegations: * encounter any conflicting delegations:
*/ */
return notify_change2(mnt, dentry, &newattrs, NULL); return notify_change(dentry, &newattrs, NULL);
} }
/* /*
@ -1855,7 +1855,7 @@ int file_remove_privs(struct file *file)
if (kill < 0) if (kill < 0)
return kill; return kill;
if (kill) if (kill)
error = __remove_privs(file->f_path.mnt, dentry, kill); error = __remove_privs(dentry, kill);
if (!error) if (!error)
inode_has_no_xattr(inode); inode_has_no_xattr(inode);

2
fs/namei.c
View File

@ -3080,7 +3080,7 @@ static int handle_truncate(struct file *filp)
if (!error) if (!error)
error = security_path_truncate(path); error = security_path_truncate(path);
if (!error) { if (!error) {
error = do_truncate2(path->mnt, path->dentry, 0, error = do_truncate(path->dentry, 0,
ATTR_MTIME|ATTR_CTIME|ATTR_OPEN, ATTR_MTIME|ATTR_CTIME|ATTR_OPEN,
filp); filp);
} }

23
fs/open.c
View File

@ -35,8 +35,8 @@
#include "internal.h" #include "internal.h"
int do_truncate2(struct vfsmount *mnt, struct dentry *dentry, loff_t length, int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
unsigned int time_attrs, struct file *filp) struct file *filp)
{ {
int ret; int ret;
struct iattr newattrs; struct iattr newattrs;
@ -61,24 +61,17 @@ int do_truncate2(struct vfsmount *mnt, struct dentry *dentry, loff_t length,
inode_lock(dentry->d_inode); inode_lock(dentry->d_inode);
/* Note any delegations or leases have already been broken: */ /* Note any delegations or leases have already been broken: */
ret = notify_change2(mnt, dentry, &newattrs, NULL); ret = notify_change(dentry, &newattrs, NULL);
inode_unlock(dentry->d_inode); inode_unlock(dentry->d_inode);
return ret; return ret;
} }
int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
struct file *filp)
{
return do_truncate2(NULL, dentry, length, time_attrs, filp);
}
long vfs_truncate(const struct path *path, loff_t length) long vfs_truncate(const struct path *path, loff_t length)
{ {
struct inode *inode; struct inode *inode;
struct vfsmount *mnt;
long error; long error;
inode = path->dentry->d_inode; inode = path->dentry->d_inode;
mnt = path->mnt;
/* For directories it's -EISDIR, for other non-regulars - -EINVAL */ /* For directories it's -EISDIR, for other non-regulars - -EINVAL */
if (S_ISDIR(inode->i_mode)) if (S_ISDIR(inode->i_mode))
@ -114,7 +107,7 @@ long vfs_truncate(const struct path *path, loff_t length)
if (!error) if (!error)
error = security_path_truncate(path); error = security_path_truncate(path);
if (!error) if (!error)
error = do_truncate2(mnt, path->dentry, length, 0, NULL); error = do_truncate(path->dentry, length, 0, NULL);
put_write_and_out: put_write_and_out:
put_write_access(inode); put_write_access(inode);
@ -163,7 +156,6 @@ long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
{ {
struct inode *inode; struct inode *inode;
struct dentry *dentry; struct dentry *dentry;
struct vfsmount *mnt;
struct fd f; struct fd f;
int error; int error;
@ -180,7 +172,6 @@ long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
small = 0; small = 0;
dentry = f.file->f_path.dentry; dentry = f.file->f_path.dentry;
mnt = f.file->f_path.mnt;
inode = dentry->d_inode; inode = dentry->d_inode;
error = -EINVAL; error = -EINVAL;
if (!S_ISREG(inode->i_mode) || !(f.file->f_mode & FMODE_WRITE)) if (!S_ISREG(inode->i_mode) || !(f.file->f_mode & FMODE_WRITE))
@ -201,7 +192,7 @@ long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
if (!error) if (!error)
error = security_path_truncate(&f.file->f_path); error = security_path_truncate(&f.file->f_path);
if (!error) if (!error)
error = do_truncate2(mnt, dentry, length, ATTR_MTIME|ATTR_CTIME, f.file); error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
sb_end_write(inode->i_sb); sb_end_write(inode->i_sb);
out_putf: out_putf:
fdput(f); fdput(f);
@ -567,7 +558,7 @@ static int chmod_common(const struct path *path, umode_t mode)
goto out_unlock; goto out_unlock;
newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO); newattrs.ia_mode = (mode & S_IALLUGO) | (inode->i_mode & ~S_IALLUGO);
newattrs.ia_valid = ATTR_MODE | ATTR_CTIME; newattrs.ia_valid = ATTR_MODE | ATTR_CTIME;
error = notify_change2(path->mnt, path->dentry, &newattrs, &delegated_inode); error = notify_change(path->dentry, &newattrs, &delegated_inode);
out_unlock: out_unlock:
inode_unlock(inode); inode_unlock(inode);
if (delegated_inode) { if (delegated_inode) {
@ -658,7 +649,7 @@ static int chown_common(const struct path *path, uid_t user, gid_t group)
inode_lock(inode); inode_lock(inode);
error = security_path_chown(path, uid, gid); error = security_path_chown(path, uid, gid);
if (!error) if (!error)
error = notify_change2(path->mnt, path->dentry, &newattrs, &delegated_inode); error = notify_change(path->dentry, &newattrs, &delegated_inode);
inode_unlock(inode); inode_unlock(inode);
if (delegated_inode) { if (delegated_inode) {
error = break_deleg_wait(&delegated_inode); error = break_deleg_wait(&delegated_inode);

2
fs/utimes.c
View File

@ -57,7 +57,7 @@ static int utimes_common(const struct path *path, struct timespec64 *times)
} }
retry_deleg: retry_deleg:
inode_lock(inode); inode_lock(inode);
error = notify_change2(path->mnt, path->dentry, &newattrs, &delegated_inode); error = notify_change(path->dentry, &newattrs, &delegated_inode);
inode_unlock(inode); inode_unlock(inode);
if (delegated_inode) { if (delegated_inode) {
error = break_deleg_wait(&delegated_inode); error = break_deleg_wait(&delegated_inode);

6
include/linux/fs.h
View File

@ -1928,8 +1928,7 @@ struct inode_operations {
int (*rename) (struct inode *, struct dentry *, int (*rename) (struct inode *, struct dentry *,
struct inode *, struct dentry *, unsigned int); struct inode *, struct dentry *, unsigned int);
int (*setattr) (struct dentry *, struct iattr *); int (*setattr) (struct dentry *, struct iattr *);
int (*setattr2) (struct vfsmount *, struct dentry *, struct iattr *); int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);
int (*getattr) (const struct path *, struct kstat *, u32, unsigned int);
ssize_t (*listxattr) (struct dentry *, char *, size_t); ssize_t (*listxattr) (struct dentry *, char *, size_t);
int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start,
u64 len); u64 len);
@ -2597,8 +2596,6 @@ static_assert(offsetof(struct filename, iname) % sizeof(long) == 0);
extern long vfs_truncate(const 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, extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs,
struct file *filp); struct file *filp);
extern int do_truncate2(struct vfsmount *, struct dentry *, loff_t start,
unsigned int time_attrs, struct file *filp);
extern int vfs_fallocate(struct file *file, int mode, loff_t offset, extern int vfs_fallocate(struct file *file, int mode, loff_t offset,
loff_t len); loff_t len);
extern long do_sys_open(int dfd, const char __user *filename, int flags, extern long do_sys_open(int dfd, const char __user *filename, int flags,
@ -2946,7 +2943,6 @@ extern void emergency_remount(void);
extern sector_t bmap(struct inode *, sector_t); extern sector_t bmap(struct inode *, sector_t);
#endif #endif
extern int notify_change(struct dentry *, struct iattr *, struct inode **); extern int notify_change(struct dentry *, struct iattr *, struct inode **);
extern int notify_change2(struct vfsmount *, struct dentry *, struct iattr *, struct inode **);
extern int inode_permission(struct inode *, int); extern int inode_permission(struct inode *, int);
extern int generic_permission(struct inode *, int); extern int generic_permission(struct inode *, int);
extern int __check_sticky(struct inode *dir, struct inode *inode); extern int __check_sticky(struct inode *dir, struct inode *inode);