From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757455Ab2CaNjW (ORCPT ); Sat, 31 Mar 2012 09:39:22 -0400 Received: from 206.83.70.73.ptr.us.xo.net ([206.83.70.73]:49326 "EHLO king.tilera.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756230Ab2CaNjU (ORCPT ); Sat, 31 Mar 2012 09:39:20 -0400 Message-Id: <201203311339.q2VDdJMD006254@farm-0012.internal.tilera.com> From: Chris Metcalf Date: Fri, 30 Mar 2012 16:07:12 -0400 Subject: [PATCH v2] hugetlb: fix race condition in hugetlb_fault() To: , , Andrew Morton , Michal Hocko , KAMEZAWA Hiroyuki , Hugh Dickins , Hillf Danton In-Reply-To: References: <201203302018.q2UKIFH5020745@farm-0012.internal.tilera.com> X-OriginalArrivalTime: 31 Mar 2012 13:39:19.0548 (UTC) FILETIME=[AC88BBC0:01CD0F43] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The race is as follows. Suppose a multi-threaded task forks a new process, thus bumping up the ref count on all the pages. While the fork is occurring (and thus we have marked all the PTEs as read-only), another thread in the original process tries to write to a huge page, taking an access violation from the write-protect and calling hugetlb_cow(). Now, suppose the fork() fails. It will undo the COW and decrement the ref count on the pages, so the ref count on the huge page drops back to 1. Meanwhile hugetlb_cow() also decrements the ref count by one on the original page, since the original address space doesn't need it any more, having copied a new page to replace the original page. This leaves the ref count at zero, and when we call unlock_page(), we panic. The solution is to take an extra reference to the page while we are holding the lock on it. Cc: stable@kernel.org Signed-off-by: Chris Metcalf --- This change incorporates Hillf Danton's suggestion to just unconditionally get and put the page around the region of code in question. mm/hugetlb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1871753..5f53d6b 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2701,6 +2701,7 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, * so no worry about deadlock. */ page = pte_page(entry); + get_page(page); if (page != pagecache_page) lock_page(page); @@ -2732,6 +2733,7 @@ out_page_table_lock: } if (page != pagecache_page) unlock_page(page); + put_page(page); out_mutex: mutex_unlock(&hugetlb_instantiation_mutex); -- 1.6.5.2