Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 153D237AA7D; Thu, 20 Aug 2026 17:38:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787247487; cv=none; b=N13RnzF+guw8wKoAD0/wcBPQUH1GjpauXBDJ46FgtQhDrsPMjfJGQcjjiZjK/fUVuzEPrfhan/rLzra+49eBhHJubdPJVZDs9uugws3/OH0EZyADo7t9dpm0mTnnwjNNE6nerV1QHTQLaofTl3z4W4MoyIkDO/6LWUxoSYMc6o0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787247487; c=relaxed/simple; bh=yI8ztXVa5/nlliFCQYgzDiEtFn30fRk0doCtAFKFLAM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CQsssfaWXs9gt7abBts4ClmcYJd89EjigAR/v3Xt8PtqE/Tm3dt2srz7oHT1ctX3azJVNtn5tjjxDSx6XOeA1VtNVcVDWUSUhh0XA34LvtgWyZD6Mb2fM/8fb4xk4Am37w2JNo7EPMUisyDbcetaj3+EII+gHq51YJpX0nfLwT0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=s858OEsq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="s858OEsq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71B411F000E9; Thu, 20 Aug 2026 17:38:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787247486; bh=PMbSfnq2VNmHlTYDJikjBTlTVeVuqDT18saskGfQhpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=s858OEsqNk2ZMs9p2mjhSOcIZP4XkS+5wyr6ZcNK2MmCmFPuy9xxN5an7Qpv9I+oj X6jAH+hg49PdC6Z42neOU6D7AC/+rPLpuIieiaHangXFP+HXB3WGpAKHgE+Aoty5zk yJ11jGAMLE8tm9B1M0bXEMcnUSRwoA29v+TMKlkc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Rosca , Leo Liu , Ruijing Dong , Alex Deucher Subject: [PATCH 6.6 062/166] drm/amdgpu: Fix UVD decode image min size calculation Date: Thu, 20 Aug 2026 16:55:21 +0200 Message-ID: <20260820145213.014509546@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145211.194104353@linuxfoundation.org> References: <20260820145211.194104353@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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Rosca commit b8bb9ba3f101a1b0011f785a577a4a0a38371174 upstream. This needs to use pitch instead of width. Also reject pitch over 4096 to avoid overflow. Signed-off-by: David Rosca Acked-by: Leo Liu Reviewed-by: Ruijing Dong Signed-off-by: Alex Deucher (cherry picked from commit b41c8cb12e202b220353332ab87dc01a11f69304) Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c @@ -754,7 +754,7 @@ static int amdgpu_uvd_cs_msg_decode(stru return -EINVAL; } - if (width > pitch) { + if (width > pitch || pitch > 4096) { DRM_ERROR("Invalid UVD decoding target pitch!\n"); return -EINVAL; } @@ -766,7 +766,7 @@ static int amdgpu_uvd_cs_msg_decode(stru } buf_sizes[0x1] = dpb_size; - buf_sizes[0x2] = image_size; + buf_sizes[0x2] = (pitch * height) * 3 / 2; buf_sizes[0x4] = min_ctx_size; /* store image width to adjust nb memory pstate */ adev->uvd.decode_image_width = width;