Commit 8e8f6b63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'locking_urgent_for_v6.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fix from Borislav Petkov:

 - Prevent a futex hash leak due to different mm lifetimes

* tag 'locking_urgent_for_v6.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  futex: Move futex cleanup to __mmdrop()
parents 561c8036 e703b7e2

kernel/fork.c

+1 −1
Original line number Diff line number Diff line
@@ -689,6 +689,7 @@ void __mmdrop(struct mm_struct *mm) 
	mm_pasid_drop(mm);

	mm_destroy_cid(mm);

	percpu_counter_destroy_many(mm->rss_stat, NR_MM_COUNTERS);

	futex_hash_free(mm);



	free_mm(mm);

}
@@ -1137,7 +1138,6 @@ static inline void __mmput(struct mm_struct *mm) 
	if (mm->binfmt)

		module_put(mm->binfmt->module);

	lru_gen_del_mm(mm);

	futex_hash_free(mm);

	mmdrop(mm);

}