diff options
| author | Al Viro <viro@ZenIV.linux.org.uk> | 2014-11-19 19:34:49 +0000 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2014-11-20 10:16:58 +0000 |
| commit | 571a4b57975aaaf50479a59882f1d44ae2737084 (patch) | |
| tree | f1c55bc1307ecefc13ac0572403858d9bd23e718 /fs/gfs2 | |
| parent | 30badc9543490f41497c42f004db02f1e8a29341 (diff) | |
| download | linux-571a4b57975aaaf50479a59882f1d44ae2737084.tar.gz linux-571a4b57975aaaf50479a59882f1d44ae2737084.tar.bz2 linux-571a4b57975aaaf50479a59882f1d44ae2737084.zip | |
GFS2: bugger off early if O_CREAT open finds a directory
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2')
| -rw-r--r-- | fs/gfs2/inode.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c index 04065e5af4b6..f41b2fd12416 100644 --- a/fs/gfs2/inode.c +++ b/fs/gfs2/inode.c @@ -624,6 +624,11 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry, inode = gfs2_dir_search(dir, &dentry->d_name, !S_ISREG(mode) || excl); error = PTR_ERR(inode); if (!IS_ERR(inode)) { + if (S_ISDIR(inode->i_mode)) { + iput(inode); + inode = ERR_PTR(-EISDIR); + goto fail_gunlock; + } d = d_splice_alias(inode, dentry); error = PTR_ERR(d); if (IS_ERR(d)) { |