mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
Merge branch 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull compat and uaccess updates from Al Viro:
- {get,put}_compat_sigset() series
- assorted compat ioctl stuff
- more set_fs() elimination
- a few more timespec64 conversions
- several removals of pointless access_ok() in places where it was
followed only by non-__ variants of primitives
* 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (24 commits)
coredump: call do_unlinkat directly instead of sys_unlink
fs: expose do_unlinkat for built-in callers
ext4: take handling of EXT4_IOC_GROUP_ADD into a helper, get rid of set_fs()
ipmi: get rid of pointless access_ok()
pi433: sanitize ioctl
cxlflash: get rid of pointless access_ok()
mtdchar: get rid of pointless access_ok()
r128: switch compat ioctls to drm_ioctl_kernel()
selection: get rid of field-by-field copyin
VT_RESIZEX: get rid of field-by-field copyin
i2c compat ioctls: move to ->compat_ioctl()
sched_rr_get_interval(): move compat to native, get rid of set_fs()
mips: switch to {get,put}_compat_sigset()
sparc: switch to {get,put}_compat_sigset()
s390: switch to {get,put}_compat_sigset()
ppc: switch to {get,put}_compat_sigset()
parisc: switch to {get,put}_compat_sigset()
get_compat_sigset()
get rid of {get,put}_compat_itimerspec()
io_getevents: Use timespec64 to represent timeouts
...
This commit is contained in:
commit
93f30c73ec
32 changed files with 508 additions and 821 deletions
12
fs/namei.c
12
fs/namei.c
|
|
@ -4010,10 +4010,9 @@ EXPORT_SYMBOL(vfs_unlink);
|
|||
* writeout happening, and we don't want to prevent access to the directory
|
||||
* while waiting on the I/O.
|
||||
*/
|
||||
static long do_unlinkat(int dfd, const char __user *pathname)
|
||||
long do_unlinkat(int dfd, struct filename *name)
|
||||
{
|
||||
int error;
|
||||
struct filename *name;
|
||||
struct dentry *dentry;
|
||||
struct path path;
|
||||
struct qstr last;
|
||||
|
|
@ -4022,8 +4021,7 @@ static long do_unlinkat(int dfd, const char __user *pathname)
|
|||
struct inode *delegated_inode = NULL;
|
||||
unsigned int lookup_flags = 0;
|
||||
retry:
|
||||
name = filename_parentat(dfd, getname(pathname), lookup_flags,
|
||||
&path, &last, &type);
|
||||
name = filename_parentat(dfd, name, lookup_flags, &path, &last, &type);
|
||||
if (IS_ERR(name))
|
||||
return PTR_ERR(name);
|
||||
|
||||
|
|
@ -4065,12 +4063,12 @@ exit2:
|
|||
mnt_drop_write(path.mnt);
|
||||
exit1:
|
||||
path_put(&path);
|
||||
putname(name);
|
||||
if (retry_estale(error, lookup_flags)) {
|
||||
lookup_flags |= LOOKUP_REVAL;
|
||||
inode = NULL;
|
||||
goto retry;
|
||||
}
|
||||
putname(name);
|
||||
return error;
|
||||
|
||||
slashes:
|
||||
|
|
@ -4091,12 +4089,12 @@ SYSCALL_DEFINE3(unlinkat, int, dfd, const char __user *, pathname, int, flag)
|
|||
if (flag & AT_REMOVEDIR)
|
||||
return do_rmdir(dfd, pathname);
|
||||
|
||||
return do_unlinkat(dfd, pathname);
|
||||
return do_unlinkat(dfd, getname(pathname));
|
||||
}
|
||||
|
||||
SYSCALL_DEFINE1(unlink, const char __user *, pathname)
|
||||
{
|
||||
return do_unlinkat(AT_FDCWD, pathname);
|
||||
return do_unlinkat(AT_FDCWD, getname(pathname));
|
||||
}
|
||||
|
||||
int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname)
|
||||
|
|
|
|||
Loading…
Reference in a new issue