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 6BFA913DB92; Tue, 27 Feb 2024 14:01:25 +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=1709042485; cv=none; b=Sz6m6rqtwo3hltTSr5/uvSHDb7pTUMckPGQC6Qe9b7MRaFOHMF9Bv+2zb2RGHIpl4GUIODKoRVkba5Q53Jj6WvVg7tSzzv/r7/lOQqzi1wKebGwZo7mNfBm0Zh0Agv9iSwgbwUCOaUdGDYy5MOfvkA5ihDpfRbJ5xDWbUyfSeS8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709042485; c=relaxed/simple; bh=V3Fi8dsIAk1/l6s9pj3PVjc7+1z2IS1kaeAy5794i5c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=trcHOZoYdrP2xJpe1Sbz20q057jfKpj3zZVFWX/gPbOWLTXiP4GGoOiAC7h44YYNnSBgVQFXtKjiW7NdtDYVs9A8jZD6FZi8d7yNUJntgMMlfMqBQoHhCetoCqtqdsDomNqAkNlQOhb7/byJtqm8WtkwFT+gzH6ww1VMizdw4Ks= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HJcndzHQ; 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="HJcndzHQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D3AFC433F1; Tue, 27 Feb 2024 14:01:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1709042485; bh=V3Fi8dsIAk1/l6s9pj3PVjc7+1z2IS1kaeAy5794i5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HJcndzHQs3Q61iFfMrXD2UbVuhWAeDkxp0YVPsXCNp1Yu7nq0LIzYEOOuhq43RNne VrrzWK+ArObm0XELFfaGAsa0kGGcj9gns2pekEti76eC9aE0RSwaXhwMB1l3ZnL1md 1gv6lYXUXveEqfrgub7mahluSLGuNtU7nErte7Ec= 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 5.15 013/245] userfaultfd: fix mmap_changing checking in mfill_atomic_hugetlb Date: Tue, 27 Feb 2024 14:23:21 +0100 Message-ID: <20240227131615.545586957@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240227131615.098467438@linuxfoundation.org> References: <20240227131615.098467438@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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: Mike Rapoport (IBM) Signed-off-by: Greg Kroah-Hartman --- mm/userfaultfd.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -289,6 +289,7 @@ static __always_inline ssize_t __mcopy_a unsigned long dst_start, unsigned long src_start, unsigned long len, + atomic_t *mmap_changing, enum mcopy_atomic_mode mode) { int vm_shared = dst_vma->vm_flags & VM_SHARED; @@ -405,6 +406,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; @@ -440,6 +450,7 @@ extern ssize_t __mcopy_atomic_hugetlb(st unsigned long dst_start, unsigned long src_start, unsigned long len, + atomic_t *mmap_changing, enum mcopy_atomic_mode mode); #endif /* CONFIG_HUGETLB_PAGE */ @@ -561,7 +572,8 @@ retry: */ if (is_vm_hugetlb_page(dst_vma)) return __mcopy_atomic_hugetlb(dst_mm, dst_vma, dst_start, - src_start, len, mcopy_mode); + src_start, len, mmap_changing, + mcopy_mode); if (!vma_is_anonymous(dst_vma) && !vma_is_shmem(dst_vma)) goto out_unlock;