From: Sasha Levin Date: Mon, 26 Oct 2020 14:21:49 +0000 (-0400) Subject: Drop mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch X-Git-Tag: v4.4.241~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c3a58751dfc80d6bd81965951083f45f180a9e7;p=thirdparty%2Fkernel%2Fstable-queue.git Drop mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.8/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch b/queue-5.8/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch deleted file mode 100644 index 9cfb08a5605..00000000000 --- a/queue-5.8/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch +++ /dev/null @@ -1,49 +0,0 @@ -From fe5cb9c1da4800f1d8411f22cb03bf982e3f5e7b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Oct 2020 20:07:43 -0700 -Subject: mm/mmu_notifier: fix mmget() assert in __mmu_interval_notifier_insert -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Jann Horn - -[ Upstream commit c9682d10271e1025ebfbb1675c7afffbef5c6856 ] - -The comment talks about having to hold mmget() (which means mm_users), but -the actual check is on mm_count (which would be mmgrab()). - -Given that MMU notifiers are torn down in mmput() -> __mmput() -> -exit_mmap() -> mmu_notifier_release(), I believe that the comment is -correct and the check should be on mm->mm_users. Fix it up accordingly. - -Fixes: 99cb252f5e68 ("mm/mmu_notifier: add an interval tree notifier") -Signed-off-by: Jann Horn -Signed-off-by: Andrew Morton -Reviewed-by: Jason Gunthorpe -Cc: John Hubbard -Cc: Christoph Hellwig -Cc: Christian König -Signed-off-by: Sasha Levin ---- - mm/mmu_notifier.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c -index 352bb9f3ecc02..0d31b4ee63c04 100644 ---- a/mm/mmu_notifier.c -+++ b/mm/mmu_notifier.c -@@ -913,7 +913,7 @@ static int __mmu_interval_notifier_insert( - return -EOVERFLOW; - - /* Must call with a mmget() held */ -- if (WARN_ON(atomic_read(&mm->mm_count) <= 0)) -+ if (WARN_ON(atomic_read(&mm->mm_users) <= 0)) - return -EINVAL; - - /* pairs with mmdrop in mmu_interval_notifier_remove() */ --- -2.25.1 - diff --git a/queue-5.8/series b/queue-5.8/series index 2ad473a8faf..e27614ab2ea 100644 --- a/queue-5.8/series +++ b/queue-5.8/series @@ -419,7 +419,6 @@ afs-fix-cell-purging-with-aliases.patch afs-fix-cell-removal.patch rdma-rxe-handle-skb_clone-failure-in-rxe_recv.c.patch mm-page_owner-change-split_page_owner-to-take-a-coun.patch -mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch lib-crc32.c-fix-trivial-typo-in-preprocessor-conditi.patch ramfs-fix-nommu-mmap-with-gaps-in-the-page-cache.patch rapidio-fix-error-handling-path.patch diff --git a/queue-5.9/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch b/queue-5.9/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch deleted file mode 100644 index bbc0940905f..00000000000 --- a/queue-5.9/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 66da55b8babcf5379e129595e69bcb13b6b268d5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 15 Oct 2020 20:07:43 -0700 -Subject: mm/mmu_notifier: fix mmget() assert in __mmu_interval_notifier_insert -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -From: Jann Horn - -[ Upstream commit c9682d10271e1025ebfbb1675c7afffbef5c6856 ] - -The comment talks about having to hold mmget() (which means mm_users), but -the actual check is on mm_count (which would be mmgrab()). - -Given that MMU notifiers are torn down in mmput() -> __mmput() -> -exit_mmap() -> mmu_notifier_release(), I believe that the comment is -correct and the check should be on mm->mm_users. Fix it up accordingly. - -Fixes: 99cb252f5e68 ("mm/mmu_notifier: add an interval tree notifier") -Signed-off-by: Jann Horn -Signed-off-by: Andrew Morton -Reviewed-by: Jason Gunthorpe -Cc: John Hubbard -Cc: Christoph Hellwig -Cc: Christian König -Signed-off-by: Sasha Levin ---- - mm/mmu_notifier.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c -index 4fc918163dd32..5654dd19addc0 100644 ---- a/mm/mmu_notifier.c -+++ b/mm/mmu_notifier.c -@@ -913,7 +913,7 @@ static int __mmu_interval_notifier_insert( - return -EOVERFLOW; - - /* Must call with a mmget() held */ -- if (WARN_ON(atomic_read(&mm->mm_count) <= 0)) -+ if (WARN_ON(atomic_read(&mm->mm_users) <= 0)) - return -EINVAL; - - /* pairs with mmdrop in mmu_interval_notifier_remove() */ --- -2.25.1 - diff --git a/queue-5.9/series b/queue-5.9/series index 4a609440f92..82c56b87c70 100644 --- a/queue-5.9/series +++ b/queue-5.9/series @@ -509,7 +509,6 @@ rdma-rxe-handle-skb_clone-failure-in-rxe_recv.c.patch mm-page_owner-change-split_page_owner-to-take-a-coun.patch mm-huge_memory-fix-split-assumption-of-page-size.patch mm-fix-a-race-during-thp-splitting.patch -mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch lib-crc32.c-fix-trivial-typo-in-preprocessor-conditi.patch ramfs-fix-nommu-mmap-with-gaps-in-the-page-cache.patch rapidio-fix-error-handling-path.patch