From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795045656; b=v8YBvkhumolLYKxAVw/IktyYTVGsrqFE/YEtKeW/PHCLo3l58XwNiNrLuI2VMlPfmAXk AMrhaSS7+O8dmzno5uIjYGpfmRknUHqYNu54EfxK7nFJA6WMPlwzIpWUbi3HVB7bPkZVF ufZgrSLUQPrtQJGi65NUt6D/4F7wmuHSE27t4aSI1Ry73+8fKuGmQ64RoVj7uWLyauvhr j/TVQNjOff3B9NXa73v6hvfLsOeLCvqr8h0Nv0YFwQUOEMu3aIYsfBcF16wX444Se5ivY uH0edwaT523YM5VM9Hni3iRxB5eUWLlryNU5uW4fOSdm41golMPbfJSkL8WMWLIHcSQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795045656; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=Kkn7dV2SGjJmsExwwTNHRV5WIBg13ewiMBBiUsuolXM=; b=Y2+xolC4A0pKF6iT2LedjTcaiyOaHeG3psBU/oRcNlboAYvAGYrZCFwqwTtQVcBAAm4j WJgMWLKIRFIwJS6C1gNjnPYUyPOeJm3h9GOSmOe6QP5BFzyrsfcThcVdn7QTDQ0uuZSYS DEYYzS6IJ0Vifhh57DfS9Gee05eYx+rzNQRPLmH2Iwq1aSIrB3bnY1O/mvcoYAXFngpSr xtSqYX4jPzI7ra4YynDqfcjYDlK7++WNCVMfPpgp0mE4jgM32BTixUpm/hgQBVj9vkHhL iboDVKt98Vf1BBRU82QDeuz/l4SOnn2y7gujH/WUrGKq9Rv42pW+hLMai09Exx5hJsw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=GSN5teDi; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 45DF0606A325; Wed, 18 Nov 2026 23:47:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=GSN5teDi Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B79C1F000C4; Wed, 18 Nov 2026 23:47:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795045655; bh=Kkn7dV2SGjJmsExwwTNHRV5WIBg13ewiMBBiUsuolXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=GSN5teDitwzxt70vDRx6cvpOiDDoCsHAbMXiUcpiqWKg8bCu4aZfvEWaVA2/kq7/e s8qdh2Sunq2rrwRK5yNi8Kl6izqrA24aYpkZnF5edW8HTsJkjVHbexuki6paCW7jnz r+b5ktWcmqCHxqwlRBs4rgoixRF4hkIg7ClKNiH8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Christian=20K=C3=B6nig?= , Philip Yang , Felix Kuehling , Jesse Zhang , Felix Kuehling , Alex Deucher , Sasha Levin Subject: [PATCH 6.1 1002/2857] drm/amdgpu: reject ANONONLY userptrs that span multiple VMAs Date: Wed, 18 Nov 2026 15:33:56 +0100 Message-ID: <20261118150237.676860510@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jesse Zhang [ Upstream commit d577b68a854d0f590f480777249b041507d0708c ] For AMDGPU_GEM_USERPTR_ANONONLY, amdgpu_ttm_tt_get_user_pages() only checks the VMA at the start of the range for a backing file, and amdgpu_hmm_range_get_pages() then faults in the whole range, across any other VMAs. The check used to reject ranges ending beyond the first VMA (vma->vm_end < end), which got lost when the code moved to HMM. An ANONONLY userptr over one page of file-backed memory is rejected with -EPERM, but one over an anonymous page followed by the same file-backed page is accepted. Restore the check and reject ANONONLY userptrs that cross more than one VMA. The second userptr is now rejected too. v2: reject ranges spanning multiple VMAs instead of walking every VMA (Christian) v3: cast num_pages to u64 to avoid an overflow (Christian) Fixes: 6826cb3b92a3 ("drm/amdgpu: support userptr cross VMAs case with HMM") Cc: Christian König Cc: Philip Yang Cc: Felix Kuehling Signed-off-by: Jesse Zhang Reviewed-by: Christian König Acked-by: Felix Kuehling Signed-off-by: Alex Deucher (cherry picked from commit 75d753ed4704d5efc72164d9e546b2a282e42ae2) Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 2ea823fdcd9f5..30861836b3c82 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -702,7 +702,8 @@ int amdgpu_ttm_tt_get_user_pages(struct amdgpu_bo *bo, struct page **pages, goto out_unlock; } if (unlikely((gtt->userflags & AMDGPU_GEM_USERPTR_ANONONLY) && - vma->vm_file)) { + (vma->vm_file || + vma->vm_end < start + (u64)ttm->num_pages * PAGE_SIZE))) { r = -EPERM; goto out_unlock; } -- 2.53.0