Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daca89ec authored by Ralph Campbell's avatar Ralph Campbell Committed by Greg Kroah-Hartman
Browse files

mm/hmm: fix race between hmm_mirror_unregister() and mmu_notifier callback 

commit 86a2d59841ab0b147ffc1b7b3041af87927cf312 upstream.

In hmm_mirror_unregister(), mm->hmm is set to NULL and then
mmu_notifier_unregister_no_release() is called.  That creates a small
window where mmu_notifier can call mmu_notifier_ops with mm->hmm equal to
NULL.  Fix this by first unregistering mmu notifier callbacks and then
setting mm->hmm to NULL.

Similarly in hmm_register(), set mm->hmm before registering mmu_notifier
callbacks so callback functions always see mm->hmm set.

Link: http://lkml.kernel.org/r/20181019160442.18723-4-jglisse@redhat.com


Signed-off-by: default avatarRalph Campbell <rcampbell@nvidia.com>
Signed-off-by: default avatarJérôme Glisse <jglisse@redhat.com>
Reviewed-by: default avatarJohn Hubbard <jhubbard@nvidia.com>
Reviewed-by: default avatarJérôme Glisse <jglisse@redhat.com>
Reviewed-by: default avatarBalbir Singh <bsingharora@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f968acd7

mm/hmm.c

+21 −15
Original line number Diff line number Diff line
@@ -91,16 +91,6 @@ static struct hmm *hmm_register(struct mm_struct *mm) 
	spin_lock_init(&hmm->lock);

	hmm->mm = mm;



	/*

	 * We should only get here if hold the mmap_sem in write mode ie on

	 * registration of first mirror through hmm_mirror_register()

	 */

	hmm->mmu_notifier.ops = &hmm_mmu_notifier_ops;

	if (__mmu_notifier_register(&hmm->mmu_notifier, mm)) {

		kfree(hmm);

		return NULL;

	}



	spin_lock(&mm->page_table_lock);

	if (!mm->hmm)

		mm->hmm = hmm;
@@ -108,12 +98,27 @@ static struct hmm *hmm_register(struct mm_struct *mm) 
		cleanup = true;

	spin_unlock(&mm->page_table_lock);



	if (cleanup) {

		mmu_notifier_unregister(&hmm->mmu_notifier, mm);

		kfree(hmm);

	}

	if (cleanup)

		goto error;



	/*

	 * We should only get here if hold the mmap_sem in write mode ie on

	 * registration of first mirror through hmm_mirror_register()

	 */

	hmm->mmu_notifier.ops = &hmm_mmu_notifier_ops;

	if (__mmu_notifier_register(&hmm->mmu_notifier, mm))

		goto error_mm;



	return mm->hmm;



error_mm:

	spin_lock(&mm->page_table_lock);

	if (mm->hmm == hmm)

		mm->hmm = NULL;

	spin_unlock(&mm->page_table_lock);

error:

	kfree(hmm);

	return NULL;

}



void hmm_mm_destroy(struct mm_struct *mm)
@@ -278,12 +283,13 @@ void hmm_mirror_unregister(struct hmm_mirror *mirror) 
	if (!should_unregister || mm == NULL)

		return;



	mmu_notifier_unregister_no_release(&hmm->mmu_notifier, mm);



	spin_lock(&mm->page_table_lock);

	if (mm->hmm == hmm)

		mm->hmm = NULL;

	spin_unlock(&mm->page_table_lock);



	mmu_notifier_unregister_no_release(&hmm->mmu_notifier, mm);

	kfree(hmm);

}

EXPORT_SYMBOL(hmm_mirror_unregister);