diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-04-27 09:14:20 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-03 01:51:13 +0200 |
| commit | fe9ec8291fcaa74badf0a67e3a82741b3ee40a9e (patch) | |
| tree | 64c88e278d6171fcd759c495eb90c3cd1bf6abb4 | |
| parent | do_last(): get rid of duplicate ELOOP check (diff) | |
| download | linux-fe9ec8291fcaa74badf0a67e3a82741b3ee40a9e.tar.xz linux-fe9ec8291fcaa74badf0a67e3a82741b3ee40a9e.zip | |
do_last(): take fput() on error after opening to out:
make it conditional on *opened & FILE_OPENED; in addition to getting
rid of exit_fput: thing, it simplifies atomic_open() cleanup on
may_open() failure.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/namei.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/fs/namei.c b/fs/namei.c index 6503767746f6..38eab154cef7 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -2919,9 +2919,6 @@ static int atomic_open(struct nameidata *nd, struct dentry *dentry, acc_mode = 0; } error = may_open(&file->f_path, acc_mode, open_flag); - if (error) - fput(file); - out: dput(dentry); return error; @@ -3225,18 +3222,13 @@ finish_open_created: } opened: error = open_check_o_direct(file); - if (error) - goto exit_fput; - error = ima_file_check(file, op->acc_mode, *opened); - if (error) - goto exit_fput; - - if (will_truncate) { + if (!error) + error = ima_file_check(file, op->acc_mode, *opened); + if (!error && will_truncate) error = handle_truncate(file); - if (error) - goto exit_fput; - } out: + if (unlikely(error) && (*opened & FILE_OPENED)) + fput(file); if (unlikely(error > 0)) { WARN_ON(1); error = -EINVAL; @@ -3246,10 +3238,6 @@ out: path_put(&save_parent); return error; -exit_fput: - fput(file); - goto out; - stale_open: /* If no saved parent or already retried then can't retry */ if (!save_parent.dentry || retried) |