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 2CC75340A6F; Sat, 12 Sep 2026 18:29:51 +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=1789237792; cv=none; b=X4Yv13187xLnGLN1OYxd9A2RL3cTMEwi8taps5zINQI/Vbf3HkkqPfNAhXfGtHqMcJRN4/OuiOkMivYQkdrR6H7RH44v62SBnSdHUKefy7t4E3bQgTCLVbMXUCYVcrqKk6e65KxL6lm1v5Qksrkc6gqWj+z0Di02PRG5QwqCGDg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789237792; c=relaxed/simple; bh=t3heMLDsmIQ7+sLl2YrcOxxWghGr5ceaXOq16EfkHOE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qd+0XNlk5l3Szo33AS6HOjSUFKwhFYfA7+oeU5F9ADFxWVWd9XYFcJoI2WmQw0dAT3xbQ8UbIgr07O8Z1AukDIAxmtNP5HYZPIce1PKwG+ixyH5aqqxEoV8HXemnbw4ALAUX1y7Qley5pFr9CpapylWnEFUAG+rfVsuzIYqZvqk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ptw2JO4R; 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="ptw2JO4R" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3C241F000FF; Sat, 12 Sep 2026 18:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789237791; bh=nZtlzq2jN4I7GgoTk19B5sS/BBDbZdtd7GKlTMsQ+Hs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ptw2JO4R290Phgx1WZYsWYvtA8CArQ739OMVEw5tvqbMIFK2+kgBrG5MjLKQjpUEU EcdzeLqlQ22Z8iueABakGBdprqeoEQXohGWzs2xC1OsbH37J2y6+2sJgeasB0CnMmZ JP1BLQ9U9rTICqAflvaUIzQEzQOh6vORW+5pTPrs= 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 5.15 330/935] media: venus: fix payload size calculation in parse_raw_formats() Date: Sat, 12 Sep 2026 08:56:00 +0200 Message-ID: <20260912065534.370841383@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065526.833703348@linuxfoundation.org> References: <20260912065526.833703348@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 5.15-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; }