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 6BA1E266B6F; Tue, 11 Nov 2025 01:13:54 +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=1762823634; cv=none; b=WKfa7dmukMKt4I+ltqq4ZUvarEHIG4oGEZgaw0UhIJOJCqO2DYUyA0m3za4D7bMRWJ031sX2fZw2ljdDwr78YjpWIVLwnCrshjVLycnkABM/UyZ3aunohLOmSB2yCE2ddVm/NooNbWyDl7UafrsukY5FTK98CjskZJXCr9B9SAc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762823634; c=relaxed/simple; bh=kNC7ZHvs7hlG8WigqK46TozOzZUaRzeKHBb30VleHFo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HnPazL3OwmipUswwNJJps0xcRjuxaXYBNK7imUr5o0bkFYkzUTy0ug9JG915BYgUiDVHn4JPwRe/Zk4QQoIoamV7uWlg6cxYifDnro8BJDzHhygK72UsSfRcUUygvB0KSMEbYEAWxP/WKHVVq++wvOcb9EnmxJCQMUxxyHGtqfE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1W72TPfu; 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="1W72TPfu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A8145C4CEF5; Tue, 11 Nov 2025 01:13:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1762823634; bh=kNC7ZHvs7hlG8WigqK46TozOzZUaRzeKHBb30VleHFo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1W72TPfulGt7kCXvGexIkvaZ3wgUpPfztefK5N8rz0CxFjVszaLvvzqB3DacAi5K9 gDVS/6Veq8XQxU4nUHipwZPZyA+W1qPdUrW9/MOm+7YlEhZsdb/hsK/7Jh+cG2/aJv EtuNaez5IllTBnkBTxDbchDKiWEJETOagok5/HbU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chia-I Wu , Boris Brezillon , Liviu Dudau , Steven Price , Sasha Levin Subject: [PATCH 6.12 290/565] drm/panthor: check bo offset alignment in vm bind Date: Tue, 11 Nov 2025 09:42:26 +0900 Message-ID: <20251111004533.400626766@linuxfoundation.org> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251111004526.816196597@linuxfoundation.org> References: <20251111004526.816196597@linuxfoundation.org> User-Agent: quilt/0.69 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chia-I Wu [ Upstream commit 5afa9d2a9bb1410f816e0123846047288b16e4b9 ] Fail early from panthor_vm_bind_prepare_op_ctx instead of late from ops->map_pages. Signed-off-by: Chia-I Wu Reviewed-by: Boris Brezillon Reviewed-by: Liviu Dudau Reviewed-by: Steven Price Signed-off-by: Steven Price Link: https://lore.kernel.org/r/20250828200116.3532255-1-olvaffe@gmail.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/panthor/panthor_mmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/panthor/panthor_mmu.c index 2214dbf472fa4..d548a6e0311dd 100644 --- a/drivers/gpu/drm/panthor/panthor_mmu.c +++ b/drivers/gpu/drm/panthor/panthor_mmu.c @@ -1219,7 +1219,7 @@ static int panthor_vm_prepare_map_op_ctx(struct panthor_vm_op_ctx *op_ctx, (flags & DRM_PANTHOR_VM_BIND_OP_TYPE_MASK) != DRM_PANTHOR_VM_BIND_OP_TYPE_MAP) return -EINVAL; - /* Make sure the VA and size are aligned and in-bounds. */ + /* Make sure the VA and size are in-bounds. */ if (size > bo->base.base.size || offset > bo->base.base.size - size) return -EINVAL; @@ -2389,7 +2389,7 @@ panthor_vm_bind_prepare_op_ctx(struct drm_file *file, int ret; /* Aligned on page size. */ - if (!IS_ALIGNED(op->va | op->size, vm_pgsz)) + if (!IS_ALIGNED(op->va | op->size | op->bo_offset, vm_pgsz)) return -EINVAL; switch (op->flags & DRM_PANTHOR_VM_BIND_OP_TYPE_MASK) { -- 2.51.0