From mboxrd@z Thu Jan 1 00:00:00 1970 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 5EAE15803B9; Wed, 9 Sep 2026 14:31:04 +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=1788964265; cv=none; b=V9N+7L+aVaUlxmGIslrD/V5MIZV3EgzzE3eH3MKN5mmp+eFkfXRLX5Hlw8XnLvPLVLzFWfqJl4IGUbWBDtDfJQ1HGOgoVSn08Mc0/Dzrbt/XkxlambNnX00WHfkB0Y0tyo4QYOv0dMJGSgiYzN5fEUCaZqHysW9zsYyEq60yD8E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788964265; c=relaxed/simple; bh=UptpE069bIeH4IMg1gmXL+c5qAAfWY/6+8aJn6ZFAIg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CpOOhBq08wnD7CamnMAfWTh13YN+2Vq6D/j5GUxmaM/GFwDFDw6lUs2QXZ+We30zCUOJeTwd7KMmv2gFaydVNZ12MMkcJGC6eDcO3eTi/L9zOsgDk2KrI5vRNDjQzR/ERR/ou42IxAXEY06TnMZgJDRjbNnb4Ixp7Y1cFGRGhpc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Zhh8jWld; 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="Zhh8jWld" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 538341F00A3A; Wed, 9 Sep 2026 14:31:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1788964263; bh=SmS6apCrqMhE1Q+jzSFU+NTqQKBSM8QfQHQJr2QxSro=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Zhh8jWldocZheflpXzwBJNnhTL7me71OHAuU0dgwa9R4TFE/wvo29nZQYGaIXgzkl UX19aJvfEZEiPw6A+tqzcDmW4/UJd4b7X3gJMRDjg7yNGichqwdZQGoZSlffN4fMkE P0nvFKP4ljCzNbMI0Y+eDKQHg0ShmiozuxiH+s/I= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mohammed EL Kadiri , Dmitry Baryshkov , Bryan ODonoghue Subject: [PATCH 6.18 315/583] media: venus: fix payload size calculation in parse_raw_formats() Date: Wed, 9 Sep 2026 15:40:00 +0200 Message-ID: <20260909134248.919547668@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909134237.773280130@linuxfoundation.org> References: <20260909134237.773280130@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mohammed EL Kadiri commit bd595b745eb770e80347c31ffc25351046935305 upstream. The consumed size is computed after the loop using the num_planes value from the last iteration for all entries. When entries have different plane counts, this produces an incorrect total. Accumulate the actual size during the loop instead. Fixes: 9edaaa8e3e15 ("media: venus: hfi_parser: refactor hfi packet parsing logic") Cc: stable@vger.kernel.org Signed-off-by: Mohammed EL Kadiri Reviewed-by: Dmitry Baryshkov Signed-off-by: Bryan O'Donoghue Signed-off-by: Greg Kroah-Hartman --- drivers/media/platform/qcom/venus/hfi_parser.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) --- a/drivers/media/platform/qcom/venus/hfi_parser.c +++ b/drivers/media/platform/qcom/venus/hfi_parser.c @@ -171,7 +171,7 @@ parse_raw_formats(struct venus_core *cor u32 entries = fmt->format_entries; unsigned int i = 0; u32 num_planes = 0; - u32 size; + u32 size = 2 * sizeof(u32); while (entries) { num_planes = pinfo->num_planes; @@ -186,6 +186,7 @@ parse_raw_formats(struct venus_core *cor if (pinfo->num_planes > MAX_PLANES) break; + size += sizeof(*constr) * num_planes + 2 * sizeof(u32); pinfo = (void *)pinfo + sizeof(*constr) * num_planes + 2 * sizeof(u32); entries--; @@ -193,8 +194,6 @@ parse_raw_formats(struct venus_core *cor for_each_codec(core->caps, ARRAY_SIZE(core->caps), codecs, domain, fill_raw_fmts, rawfmts, i); - size = fmt->format_entries * (sizeof(*constr) * num_planes + 2 * sizeof(u32)) - + 2 * sizeof(u32); return size; }