Skip to content

Commit

Permalink
namei: saner calling conventions for filename_create()
Browse files Browse the repository at this point in the history
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: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed May 15, 2015
1 parent 391172c commit 181c37b
Showing 1 changed file with 10 additions and 16 deletions.
26 changes: 10 additions & 16 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -3403,15 +3403,19 @@ static struct dentry *filename_create(int dfd, struct filename *name,
int error;
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
* other flags passed in are ignored!
*/
lookup_flags &= LOOKUP_REVAL;

error = filename_parentat(dfd, name, lookup_flags, path, &last, &type);
if (error)
if (error) {
putname(name);
return ERR_PTR(error);
}

/*
* Yucky last component or no last component at all?
Expand Down Expand Up @@ -3449,6 +3453,7 @@ static struct dentry *filename_create(int dfd, struct filename *name,
error = err2;
goto fail;
}
putname(name);
return dentry;
fail:
dput(dentry);
Expand All @@ -3459,20 +3464,15 @@ static struct dentry *filename_create(int dfd, struct filename *name,
mnt_drop_write(path->mnt);
out:
path_put(path);
putname(name);
return dentry;
}

struct dentry *kern_path_create(int dfd, const char *pathname,
struct path *path, unsigned int lookup_flags)
{
struct filename *filename = getname_kernel(pathname);
struct dentry *res;

if (IS_ERR(filename))
return ERR_CAST(filename);
res = filename_create(dfd, filename, path, lookup_flags);
putname(filename);
return res;
return filename_create(dfd, getname_kernel(pathname),
path, lookup_flags);
}
EXPORT_SYMBOL(kern_path_create);

Expand All @@ -3488,13 +3488,7 @@ EXPORT_SYMBOL(done_path_create);
struct dentry *user_path_create(int dfd, const char __user *pathname,
struct path *path, unsigned int lookup_flags)
{
struct filename *tmp = getname(pathname);
struct dentry *res;
if (IS_ERR(tmp))
return ERR_CAST(tmp);
res = filename_create(dfd, tmp, path, lookup_flags);
putname(tmp);
return res;
return filename_create(dfd, getname(pathname), path, lookup_flags);
}
EXPORT_SYMBOL(user_path_create);

Expand Down

0 comments on commit 181c37b

Please sign in to comment.