Memory leak in 2.4.27 kernel, using mmap raw packet sockets
Subsystems (2)
Quoted 96 lines · Andrea Arcangeli
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
That isnt sufficient. Consider anything else taking a reference to the page and the refcount going negative.
You mean not going negative? The problem here as I understand here is we dont release the count if the PageReserved is set, but we should.
Drivers like the OSS audio drivers move page between Reserved and unreserved. The count can thus be corrupted.
the
PG_reservedgoes away afterVM_IO, so forbidding pages withPG_reservedof vmas withVM_IOisn't any different as far as I can tell, and sincePG_reservedis the real offender sure we shouldn't leave a check inget_user_pagesthat explicitly do something if the page is reserved, since if the page is reserved at that point we'd need to return-EFAULTorBUG_ON.Adding the
VM_IOpatch on top of this is sure a good idea.mm/memory.c renamed from mm/memory.c.~1~ +2
-3@@ -806,7 +806,7 @@ int get_user_pages(struct task_struct *t }if (pages) { pages[i] =get_page_map (map); -if (!pages[i]) { +if (!pages[i] ||PageReserved (pages[i])) {spin_unlock (&mm->page_table_lock);while (i--)page_cache_release (pages[i]);@@ -814,8 +814,7 @@ int get_user_pages(struct task_struct *t goto out; }flush_dcache_page (pages[i]); -if (!PageReserved (pages[i])) -page_cache_get (pages[i]); +page_cache_get (pages[i]); }if (vmas) vmas[i] = vma;My version of the fix for 2.4 is this, but this fixes as well an issue with the zeropage and it's on top of some other fix for COW corruption in 2.4 not yet fixed in mainline 2.4. Since 2.4 never checked PageReserved like 2.6 does in
get_user_pages, 2.4 as worse can suffer a memleak.include/linux/mm.h renamed from include/linux/mm.h.~1~ +2
-3@@ -533,9 +533,8 @@ extern void unpin_pte_page(struct page *static inline void put_user_page_pte_pin (struct page * page) { -if (PagePinned (page)) -/* must run before put_page, put_page may free the page */ -unpin_pte_page (page); +/* must run before put_page, put_page may free the page */ +unpin_pte_page (page);put_page (page); }mm/memory.c renamed from mm/memory.c.~1~ +13
-12@@ -530,7 +530,11 @@ void __wait_on_pte_pinned_page(struct pavoid unpin_pte_page (struct page *page) { -wait_queue_head_t *waitqueue =page_waitqueue (page); +wait_queue_head_t *waitqueue; + +if (!PagePinned (page)) +return ; + waitqueue =page_waitqueue (page);if (unlikely (!TestClearPagePinned (page)))BUG ();smp_mb__after_clear_bit ();@@ -598,17 +602,21 @@ int __get_user_pages(struct task_struct*/ if (!map) goto bad_page; -page_cache_get (map); -if (pte_pin &&unlikely (TestSetPagePinned (map))) { -/* fail if this is a duplicate physical page in this kiovec */ -int i2 = i; -while (i2--) -if (map == pages[i2]) { -put_page (map); - goto bad_page; - } -/* hold a reference on "map" so we can wait on it */ - goto pte_pin_collision; +if (map !=ZERO_PAGE (start)) { +if (PageReserved (map)) + goto bad_page; +page_cache_get (map); +if (pte_pin &&unlikely (TestSetPagePinned (map))) { +/* fail if this is a duplicate physical page in this kiovec */ +int i2 = i; +while (i2--)
mm/memory.c int __get_user_pages(struct task_struct · line 622
Quoted 10 lines
mm/memory.c renamed from mm/memory.c.~1~ +7
-0+if (map == pages[i2]) { +put_page (map); + goto bad_page; + } +/* hold a reference on "map" so we can wait on it */ + goto pte_pin_collision; + } } pages[i] = map; }
I can't find to which suse kernel these patch(es) apply. I assume your first one comes down to the attached one-liner for vanilla-2.4, can you confirm?
For your second: I think it needs your 9999_z-get_user_pages_pte_pin-1 patch applied beforehand?. Without that patch, are there any problems to be fixed? Can you post patches for vanilla kernels, please?
Regards,
Ozkan Sezer
mm/memory.c renamed from mm/memory.c.BAK +1 -1
@@ -499,7 +499,7 @@/* FIXME: call the correct function, * depending on the type of the found page */ -if (!pages[i]) +if (!pages[i] ||PageReserved (pages[i])) goto bad_page;page_cache_get (pages[i]); }
Quoted 3 lines · O.Sezer
I can't find to which suse kernel these patch(es) apply. I assume your first one comes down to the attached one-liner for vanilla-2.4, can you confirm?
yes.
Quoted 2 lines
For your second: I think it needs your 9999_z-get_user_pages_pte_pin-1 patch applied beforehand?. Without that patch, are there any problems
... plus yet another incremental patch not yet in 2.4.23aa3. I'll upload an aa4 soon with all of this included.
Quoted 1 line
to be fixed? Can you post patches for vanilla kernels, please?
I'll upload an aa4, then the future 9999_z-get_user_pages_pte_pin-2 will included every known fix to get_user_pages. I hope it's the same for you. I've a set of incremental fixes, and I'll join all of them together in 9999_z-get_user_pages_pte_pin-2 (the PageReserved fix will get mixed into it too, I hope that's not too confusing, the idea is that such patch will fix all issues in get_user_pages in 2.4).