From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E1F62D7817 for ; Thu, 9 Apr 2026 12:06:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736421; cv=none; b=FYip8BSSGYH5b4QW6KfwyJUNEYyN2CbCvhpTLih7LO6ktVeQYh1HR12Sgo3cfskh8JqOawJTt7JhljjG/cV/8N2Zom35zFH+JikWdn6q1leuctpV6kpnAFoQJ06Pi5QEN7WjETAshIZCxiZgidyzlTZCDlMNPdkLRyJCXf9oBWQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775736421; c=relaxed/simple; bh=/QAqgyaKq3U4bCSlwxqL6oCj2LxmdOISrYe9hmPeip8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Edqo8TtAOTRWsFO5iNpIGBVFFf14I7/XjwzVr/QoOnmA0tVQUX+RnglaseavREH36HmcrqLFtztkuWB7VTGJemsSkT7wOL811r1BbJn8Ze6PgJq1/aGvCBihM4FDIRjptmN+uDr5zHDLifvT0qbQ8eCwv+t4/WHAkkXy0OQ442E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=R+fH5J7P; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="R+fH5J7P" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-488ab2db91aso11899535e9.3 for ; Thu, 09 Apr 2026 05:06:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775736417; x=1776341217; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=sXdgIpG5FRTBrRjbb+SQdYnUqpZ5GkM25dk30cTxjFI=; b=R+fH5J7P0bcEfxJ2Q9fBohptUZy7SyjDyaANLBmEUCQ74zaN+HVtho+PZcZ2CU+637 u2bocCrwHXXAdIcgv/pghZJWfFCQHtHsURlly3pVfrSTxdR+gGUxFRW87kaVeZNjofg4 lo1HIFUbtEQ0Y4d1a0f391Ags9qKUp4K8l2DIigLFoTvKmPiUdqNEtyq4RkRvaGOkLud g0bOKPyoKH71HmDwqAUr/p7epR+kGlY4UdS3rX6p6pL9FzRq4Qyqd7zSo7PXGUCdplwQ f35jT/mH4nx4mBoMG3g7cxvp4U+G760ucEExA30byweKo9zSJeCVjX11r5VB2F9NlJqY j97A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775736417; x=1776341217; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=sXdgIpG5FRTBrRjbb+SQdYnUqpZ5GkM25dk30cTxjFI=; b=ZWO4CJ0LNf1Jt1NVlkS9DhotCXXma5Qi7tNhIDyIKjWRaqGEFEgdw4ZqbFVxBWDfgE OMUShgSpqFvJ470AvyYWXq5GkSL8tcEedfkPcW5Dh+GifPSnSqfEt6nwD7ua/g/NQC+n fuQ5a/4IYOfIgJQhNLIZ5szHs9TXJpMIQCn/yB1PKvFvWdMncAOmyB9GT15cyUhKz7G+ /6IT/soBGw0/ng08imVxEyHOHoNHDvHcsuj3nXh+8+2j3nT9+rXk91u4TUStVxsE2Oxl pMlZIUujeyzdV44HAjQT/P11FOEiAbjyD7bdkrmqkwV3nbkREF/8Pu0eQBd8k+YL4X0t 5PdQ== X-Forwarded-Encrypted: i=1; AJvYcCXQBpZCc1U/PV0D+DGjeasBcSofWFdiaLVn4Tm5I/VY0SJ7EK53L/iUlu6oS2tHQIr3MkzAMTbLEHywd6o=@vger.kernel.org X-Gm-Message-State: AOJu0YytiwHfLyNL4nuBFWE0i6lMzi+1q65LUGuzYQBFjmkT3vOGsy4D weWctYIAJOp/1GGoHNqIxIAOWxUGfmpS60mtaNVQbgVVxxAZ+SDuEzfJ X-Gm-Gg: AeBDievTXF7cpwYBjR/EzJ3iOOSTnsKwD8bt2+p59FDnxEWdDqD7OWCy7VGftFFFZWg lYAAW4TcvY1qob2FCM7yeFuw3IfQIUdvuKdRrDjjF4uL+PYKx3qYDZnc/LHgRdy3nNPayvBHCVV kH4/20dz9mD/rDClmGB59+zZqNP3uF8PPzdN/8mf/eWohmEqG/815n0d6bzgQIK8hcbMTYkuCJG /+aipH1//DKgSOKImvfogSKUzlUOja2v4NIZ89i73Vv9xQnQM9b//hi5KaAp3I0SMq7CwD1Rx93 agaBRFiAleLS2BOIn8L/92YtjLd6Z8pndEhz9nMH4DfYst6KzcEovB+C6LZkZRQexP38EX4U2UV N8kXqYnd+Zb0Myj98Ajm1ckryx38hK9d2nnaYcEoxvSQ6zeMFXhzLEcLfqleL1ylVn7ymwC60VQ GklbO/0H643R9wbwbr+dvC7XRFOHH55LhQ7Q8nq4lDTiKtpv6VgXAzgEgG23iNRjznqUJ5p+/oJ PbrM/0RfljaKtF5Xwx5oTU= X-Received: by 2002:a05:600c:628e:b0:480:20f1:7aa6 with SMTP id 5b1f17b1804b1-488997dd822mr321214615e9.21.1775736416672; Thu, 09 Apr 2026 05:06:56 -0700 (PDT) Received: from dohko.chello.ie (188-141-5-72.dynamic.upc.ie. [188.141.5.72]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488cf9e8808sm51409725e9.5.2026.04.09.05.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Apr 2026 05:06:56 -0700 (PDT) From: David Carlier To: Andrew Morton , Mike Rapoport , Peter Xu Cc: "Liam R . Howlett" , Lorenzo Stoakes , Vlastimil Babka , Jann Horn , linux-mm@kvack.org, linux-kernel@vger.kernel.org, David Carlier Subject: [PATCH v5] mm/userfaultfd: detect VMA type change after copy retry in mfill_copy_folio_retry() Date: Thu, 9 Apr 2026 13:06:53 +0100 Message-ID: <20260409120653.290386-1-devnexen@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit mfill_copy_folio_retry() drops mmap_lock for the copy_from_user() call. During this window, the VMA can be replaced with a different type (e.g. hugetlb), making the caller's ops pointer stale. Subsequent use of the stale ops can lead to incorrect folio handling or a kernel crash. Pass the caller's ops into mfill_copy_folio_retry() and compare against the current vma_uffd_ops() after re-acquiring the lock. Return -EAGAIN if they differ so the operation can be retried. Fixes: 59da5c32ffa3 ("userfaultfd: mfill_atomic(): remove retry logic") Signed-off-by: David Carlier --- mm/userfaultfd.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 481ec7eb4442..214923a411c1 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -443,7 +443,9 @@ static int mfill_copy_folio_locked(struct folio *folio, unsigned long src_addr) return ret; } -static int mfill_copy_folio_retry(struct mfill_state *state, struct folio *folio) +static int mfill_copy_folio_retry(struct mfill_state *state, + const struct vm_uffd_ops *ops, + struct folio *folio) { unsigned long src_addr = state->src_addr; void *kaddr; @@ -465,6 +467,14 @@ static int mfill_copy_folio_retry(struct mfill_state *state, struct folio *folio if (err) return err; + /* + * The VMA type may have changed while the lock was dropped + * (e.g. replaced with a hugetlb mapping), making the caller's + * ops pointer stale. + */ + if (vma_uffd_ops(state->vma) != ops) + return -EAGAIN; + err = mfill_establish_pmd(state); if (err) return err; @@ -495,7 +505,7 @@ static int __mfill_atomic_pte(struct mfill_state *state, * will take care of unlocking if needed. */ if (unlikely(ret)) { - ret = mfill_copy_folio_retry(state, folio); + ret = mfill_copy_folio_retry(state, ops, folio); if (ret) goto err_folio_put; } -- 2.53.0