mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
mnt: Protect the mountpoint hashtable with mount_lock
Protecting the mountpoint hashtable with namespace_sem was sufficient
until a call to umount_mnt was added to mntput_no_expire. At which
point it became possible for multiple calls of put_mountpoint on
the same hash chain to happen on the same time.
Kristen Johansen <[email protected]> reported:
> This can cause a panic when simultaneous callers of put_mountpoint
> attempt to free the same mountpoint. This occurs because some callers
> hold the mount_hash_lock, while others hold the namespace lock. Some
> even hold both.
>
> In this submitter's case, the panic manifested itself as a GP fault in
> put_mountpoint() when it called hlist_del() and attempted to dereference
> a m_hash.pprev that had been poisioned by another thread.
Al Viro observed that the simple fix is to switch from using the namespace_sem
to the mount_lock to protect the mountpoint hash table.
I have taken Al's suggested patch moved put_mountpoint in pivot_root
(instead of taking mount_lock an additional time), and have replaced
new_mountpoint with get_mountpoint a function that does the hash table
lookup and addition under the mount_lock. The introduction of get_mounptoint
ensures that only the mount_lock is needed to manipulate the mountpoint
hashtable.
d_set_mounted is modified to only set DCACHE_MOUNTED if it is not
already set. This allows get_mountpoint to use the setting of
DCACHE_MOUNTED to ensure adding a struct mountpoint for a dentry
happens exactly once.
Cc: [email protected]
Fixes: ce07d891a0 ("mnt: Honor MNT_LOCKED when detaching mounts")
Reported-by: Krister Johansen <[email protected]>
Suggested-by: Al Viro <[email protected]>
Acked-by: Al Viro <[email protected]>
Signed-off-by: "Eric W. Biederman" <[email protected]>
This commit is contained in:
parent
0c744ea4f7
commit
3895dbf898
2 changed files with 50 additions and 21 deletions
|
|
@ -1336,8 +1336,11 @@ int d_set_mounted(struct dentry *dentry)
|
|||
}
|
||||
spin_lock(&dentry->d_lock);
|
||||
if (!d_unlinked(dentry)) {
|
||||
dentry->d_flags |= DCACHE_MOUNTED;
|
||||
ret = 0;
|
||||
ret = -EBUSY;
|
||||
if (!d_mountpoint(dentry)) {
|
||||
dentry->d_flags |= DCACHE_MOUNTED;
|
||||
ret = 0;
|
||||
}
|
||||
}
|
||||
spin_unlock(&dentry->d_lock);
|
||||
out:
|
||||
|
|
|
|||
Loading…
Reference in a new issue