summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-10-24 18:24:04 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-24 18:24:04 +0200
commit6b609e3b0068d29c676e8f1c6d2c0d503d18fea1 (patch)
treefe70a94fd74617d68d10c5f3a467106346ce1398 /fs/gfs2
parentMerge tag 'jfs-for-4.20' of git://github.com/kleikamp/linux-shaggy (diff)
parentgfs2_meta: ->mount() can get NULL dev_name (diff)
downloadlinux-6b609e3b0068d29c676e8f1c6d2c0d503d18fea1.tar.xz
linux-6b609e3b0068d29c676e8f1c6d2c0d503d18fea1.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro. * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: gfs2_meta: ->mount() can get NULL dev_name ecryptfs_rename(): verify that lower dentries are still OK after lock_rename() cachefiles: fix the race between cachefiles_bury_object() and rmdir(2)
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/ops_fstype.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index c2469833b4fb..6b84ef6ccff3 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1333,6 +1333,9 @@ static struct dentry *gfs2_mount_meta(struct file_system_type *fs_type,
struct path path;
int error;
+ if (!dev_name || !*dev_name)
+ return ERR_PTR(-EINVAL);
+
error = kern_path(dev_name, LOOKUP_FOLLOW, &path);
if (error) {
pr_warn("path_lookup on %s returned error %d\n",