From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C3A9151CD6; Tue, 20 Feb 2024 21:30:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708464657; cv=none; b=PFacslTbIjjcXJwg0u7LhAJgjTIWgdamfOKQYq9cSVG9x5YxHy0yxnQAaxwZ64KYte+38wLaRcryW2REx3gfbT5DNDRgIO172zgV6hLXcRVRGa0m/eMyyUT+sEV5paQmuUpQxgAtE2Fhh7WT1SsAlbOlEUJr3pSnWW+ESzD5YHU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708464657; c=relaxed/simple; bh=b0nUsVT6FyH6QGKHGlJnf5AX5Y8apaxDoUAGzjvhduE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kBx3hyW6HbyCEf5VRCJzOUD7icw8eFlkuAtQqH3Lk+oJVqSYW7tNwqBqmZa9t4vF2o9pkpLP0xAXDfa5Cw3un6AJgS0Q6R+4XlwjyXHC6u4Sbe4lu6yhCgPyqG4d0Tm/hMR1vMqPSdZGQaWW2dRYY6rKAhajT9X1NHciikKo3z8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=GARyTHgj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="GARyTHgj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F0F7C433C7; Tue, 20 Feb 2024 21:30:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708464657; bh=b0nUsVT6FyH6QGKHGlJnf5AX5Y8apaxDoUAGzjvhduE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GARyTHgjegtYMWyAnwD93XdKPVz2U2y2QEvdnJlvRq8Kc5+/ifVKN1fvD7gDCxW6H lUIOmbpTvJpQBZGe+APi8LQ6TLj/zYUFeLdFW0A8WRniig73PA2w/TYLE8dDs+KNGM 6a58hOlYqqseoYBj2s4mcLpWDFZDSAw6EeaesRMA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lokesh Gidra , Andrea Arcangeli , Mike Rapoport , Axel Rasmussen , Brian Geffon , David Hildenbrand , Jann Horn , Kalesh Singh , "Matthew Wilcox (Oracle)" , Nicolas Geoffray , Peter Xu , Suren Baghdasaryan , Andrew Morton Subject: [PATCH 6.7 064/309] userfaultfd: fix mmap_changing checking in mfill_atomic_hugetlb Date: Tue, 20 Feb 2024 21:53:43 +0100 Message-ID: <20240220205635.220788509@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220205633.096363225@linuxfoundation.org> References: <20240220205633.096363225@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.7-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lokesh Gidra commit 67695f18d55924b2013534ef3bdc363bc9e14605 upstream. In mfill_atomic_hugetlb(), mmap_changing isn't being checked again if we drop mmap_lock and reacquire it. When the lock is not held, mmap_changing could have been incremented. This is also inconsistent with the behavior in mfill_atomic(). Link: https://lkml.kernel.org/r/20240117223729.1444522-1-lokeshgidra@google.com Fixes: df2cc96e77011 ("userfaultfd: prevent non-cooperative events vs mcopy_atomic races") Signed-off-by: Lokesh Gidra Cc: Andrea Arcangeli Cc: Mike Rapoport Cc: Axel Rasmussen Cc: Brian Geffon Cc: David Hildenbrand Cc: Jann Horn Cc: Kalesh Singh Cc: Matthew Wilcox (Oracle) Cc: Nicolas Geoffray Cc: Peter Xu Cc: Suren Baghdasaryan Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/userfaultfd.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -357,6 +357,7 @@ static __always_inline ssize_t mfill_ato unsigned long dst_start, unsigned long src_start, unsigned long len, + atomic_t *mmap_changing, uffd_flags_t flags) { struct mm_struct *dst_mm = dst_vma->vm_mm; @@ -472,6 +473,15 @@ retry: goto out; } mmap_read_lock(dst_mm); + /* + * If memory mappings are changing because of non-cooperative + * operation (e.g. mremap) running in parallel, bail out and + * request the user to retry later + */ + if (mmap_changing && atomic_read(mmap_changing)) { + err = -EAGAIN; + break; + } dst_vma = NULL; goto retry; @@ -506,6 +516,7 @@ extern ssize_t mfill_atomic_hugetlb(stru unsigned long dst_start, unsigned long src_start, unsigned long len, + atomic_t *mmap_changing, uffd_flags_t flags); #endif /* CONFIG_HUGETLB_PAGE */ @@ -622,8 +633,8 @@ retry: * If this is a HUGETLB vma, pass off to appropriate routine */ if (is_vm_hugetlb_page(dst_vma)) - return mfill_atomic_hugetlb(dst_vma, dst_start, - src_start, len, flags); + return mfill_atomic_hugetlb(dst_vma, dst_start, src_start, + len, mmap_changing, flags); if (!vma_is_anonymous(dst_vma) && !vma_is_shmem(dst_vma)) goto out_unlock;