diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2015-01-19 11:48:45 -0600 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-06 22:03:51 +0200 |
commit | c076cbf218f3cb83dffe6982587d2b9751318962 (patch) | |
tree | a850e8a6586b295edba11a8f0370089a1b46c103 /fs | |
parent | 20e62ee6fa3da23a792ca31d4b68069060317260 (diff) |
mnt: Fix the error check in __detach_mounts
commit f53e57975151f54ad8caa1b0ac8a78091cd5700a upstream.
lookup_mountpoint can return either NULL or an error value.
Update the test in __detach_mounts to test for an error value
to avoid pathological cases causing a NULL pointer dereferences.
The callers of __detach_mounts should prevent it from ever being
called on an unlinked dentry but don't take any chances.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/namespace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index 24de1e9b1d49..9e338951c4d0 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1518,7 +1518,7 @@ void __detach_mounts(struct dentry *dentry) namespace_lock(); mp = lookup_mountpoint(dentry); - if (!mp) + if (IS_ERR_OR_NULL(mp)) goto out_unlock; lock_mount_hash(); |