korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-13 14:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

namei: make filename_lookup() reject ERR_PTR() passed as name

Browse Source 
makes for much easier life in callers

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-12 16:53:42 -04:00
parent 9ad1aaa615
commit abc9f5beb1
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/namei.c
View File

@ -2122,7 +2122,10 @@ static int filename_lookup(int dfd, struct filename *name, unsigned flags,
struct path *path, struct path *root) struct path *path, struct path *root)
{ {
int retval; int retval;
struct nameidata nd, *saved_nd = set_nameidata(&nd); struct nameidata nd, *saved_nd;
if (IS_ERR(name))
return PTR_ERR(name);
saved_nd = set_nameidata(&nd);
if (unlikely(root)) { if (unlikely(root)) {
nd.root = *root; nd.root = *root;
flags |= LOOKUP_ROOT; flags |= LOOKUP_ROOT;
@ -2212,10 +2215,8 @@ out:
int kern_path(const char *name, unsigned int flags, struct path *path) int kern_path(const char *name, unsigned int flags, struct path *path)
{ {
struct filename *filename = getname_kernel(name); return filename_lookup(AT_FDCWD, getname_kernel(name),
if (IS_ERR(filename)) flags, path, NULL);
return PTR_ERR(filename);
return filename_lookup(AT_FDCWD, filename, flags, path, NULL);
} }
EXPORT_SYMBOL(kern_path); EXPORT_SYMBOL(kern_path);
@ -2232,15 +2233,9 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
struct path *path) struct path *path)
{ {
struct path root = {.mnt = mnt, .dentry = dentry}; struct path root = {.mnt = mnt, .dentry = dentry};
struct filename *filename = getname_kernel(name);
BUG_ON(flags & LOOKUP_PARENT);
if (IS_ERR(filename))
return PTR_ERR(filename);
/* the first argument of filename_lookup() is ignored with root */ /* the first argument of filename_lookup() is ignored with root */
return filename_lookup(AT_FDCWD, filename, flags , path, &root); return filename_lookup(AT_FDCWD, getname_kernel(name),
flags , path, &root);
} }
EXPORT_SYMBOL(vfs_path_lookup); EXPORT_SYMBOL(vfs_path_lookup);
@ -2298,13 +2293,8 @@ EXPORT_SYMBOL(lookup_one_len);
int user_path_at_empty(int dfd, const char __user *name, unsigned flags, int user_path_at_empty(int dfd, const char __user *name, unsigned flags,
struct path *path, int *empty) struct path *path, int *empty)
{ {
struct filename *tmp = getname_flags(name, flags, empty); return filename_lookup(dfd, getname_flags(name, flags, empty),
if (IS_ERR(tmp)) flags, path, NULL);
return PTR_ERR(tmp);
BUG_ON(flags & LOOKUP_PARENT);
return filename_lookup(dfd, tmp, flags, path, NULL);
} }
int user_path_at(int dfd, const char __user *name, unsigned flags, int user_path_at(int dfd, const char __user *name, unsigned flags,