diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2015-01-19 11:48:45 -0600 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2015-04-09 11:39:56 -0500 |
| commit | f53e57975151f54ad8caa1b0ac8a78091cd5700a (patch) | |
| tree | 7322a985d8f37d229cdb6ef66ddae5bf218b9df6 /fs | |
| parent | ce07d891a0891d3c0d0c2d73d577490486b809e1 (diff) | |
| download | op-kernel-dev-f53e57975151f54ad8caa1b0ac8a78091cd5700a.zip op-kernel-dev-f53e57975151f54ad8caa1b0ac8a78091cd5700a.tar.gz | |
mnt: Fix the error check in __detach_mounts
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.
Cc: stable@vger.kernel.org
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
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 1894d18..e8f7f8c 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1516,7 +1516,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(); |
