Commit 181c37b6 authored by Al Viro's avatar Al Viro

namei: saner calling conventions for filename_create()

a) make it reject ERR_PTR() for name
b) make it putname(name) upon return in all other cases.

seriously simplifies the callers...
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 391172c4
...@@ -3403,6 +3403,8 @@ static struct dentry *filename_create(int dfd, struct filename *name, ...@@ -3403,6 +3403,8 @@ static struct dentry *filename_create(int dfd, struct filename *name,
int error; int error;
bool is_dir = (lookup_flags & LOOKUP_DIRECTORY); bool is_dir = (lookup_flags & LOOKUP_DIRECTORY);
if (IS_ERR(name))
return ERR_CAST(name);
/* /*
* Note that only LOOKUP_REVAL and LOOKUP_DIRECTORY matter here. Any * Note that only LOOKUP_REVAL and LOOKUP_DIRECTORY matter here. Any
* other flags passed in are ignored! * other flags passed in are ignored!
...@@ -3410,8 +3412,10 @@ static struct dentry *filename_create(int dfd, struct filename *name, ...@@ -3410,8 +3412,10 @@ static struct dentry *filename_create(int dfd, struct filename *name,
lookup_flags &= LOOKUP_REVAL; lookup_flags &= LOOKUP_REVAL;
error = filename_parentat(dfd, name, lookup_flags, path, &last, &type); error = filename_parentat(dfd, name, lookup_flags, path, &last, &type);
if (error) if (error) {
putname(name);
return ERR_PTR(error); return ERR_PTR(error);
}
/* /*
* Yucky last component or no last component at all? * Yucky last component or no last component at all?
...@@ -3449,6 +3453,7 @@ static struct dentry *filename_create(int dfd, struct filename *name, ...@@ -3449,6 +3453,7 @@ static struct dentry *filename_create(int dfd, struct filename *name,
error = err2; error = err2;
goto fail; goto fail;
} }
putname(name);
return dentry; return dentry;
fail: fail:
dput(dentry); dput(dentry);
...@@ -3459,20 +3464,15 @@ static struct dentry *filename_create(int dfd, struct filename *name, ...@@ -3459,20 +3464,15 @@ static struct dentry *filename_create(int dfd, struct filename *name,
mnt_drop_write(path->mnt); mnt_drop_write(path->mnt);
out: out:
path_put(path); path_put(path);
putname(name);
return dentry; return dentry;
} }
struct dentry *kern_path_create(int dfd, const char *pathname, struct dentry *kern_path_create(int dfd, const char *pathname,
struct path *path, unsigned int lookup_flags) struct path *path, unsigned int lookup_flags)
{ {
struct filename *filename = getname_kernel(pathname); return filename_create(dfd, getname_kernel(pathname),
struct dentry *res; path, lookup_flags);
if (IS_ERR(filename))
return ERR_CAST(filename);
res = filename_create(dfd, filename, path, lookup_flags);
putname(filename);
return res;
} }
EXPORT_SYMBOL(kern_path_create); EXPORT_SYMBOL(kern_path_create);
...@@ -3488,13 +3488,7 @@ EXPORT_SYMBOL(done_path_create); ...@@ -3488,13 +3488,7 @@ EXPORT_SYMBOL(done_path_create);
struct dentry *user_path_create(int dfd, const char __user *pathname, struct dentry *user_path_create(int dfd, const char __user *pathname,
struct path *path, unsigned int lookup_flags) struct path *path, unsigned int lookup_flags)
{ {
struct filename *tmp = getname(pathname); return filename_create(dfd, getname(pathname), path, lookup_flags);
struct dentry *res;
if (IS_ERR(tmp))
return ERR_CAST(tmp);
res = filename_create(dfd, tmp, path, lookup_flags);
putname(tmp);
return res;
} }
EXPORT_SYMBOL(user_path_create); EXPORT_SYMBOL(user_path_create);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment