[PR] avcodec/hevc: Fix integer overflow in WPP entry point range check (PR #23575)

PR #23575 opened by michaelni
URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23575
Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23575.patch

Fixes: out of array access
Fixes: poc.hevc / make_poc.py
Fixes: 83WY4xnR87vb
Fixes: dad354f38d (avcodec/hevc: Check max ctb addresses for WPP)
Found-by: VulnForge Security Research Team <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>


>From 0563937340809cdb455751fab9eda5d61d0e2101 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <[email protected]>
Date: Wed, 24 Jun 2026 03:00:42 +0200
Subject: [PATCH] avcodec/hevc: Fix integer overflow in WPP entry point range
 check

Fixes: out of array access
Fixes: poc.hevc / make_poc.py
Fixes: 83WY4xnR87vb
Fixes: dad354f38d (avcodec/hevc: Check max ctb addresses for WPP)
Found-by: VulnForge Security Research Team <[email protected]>
Signed-off-by: Michael Niedermayer <[email protected]>
---
 libavcodec/hevc/hevcdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c
index 304c7447ca..934ed5a606 100644
--- a/libavcodec/hevc/hevcdec.c
+++ b/libavcodec/hevc/hevcdec.c
@@ -2935,7 +2935,7 @@ static int hls_slice_data_wpp(HEVCContext *s, const H2645NAL *nal)
     int64_t startheader, cmpt = 0;
     int j, res = 0;
 
-    if (s->sh.slice_ctb_addr_rs + s->sh.num_entry_point_offsets * sps->ctb_width >= sps->ctb_width * sps->ctb_height) {
+    if (s->sh.slice_ctb_addr_rs / sps->ctb_width >= sps->ctb_height - s->sh.num_entry_point_offsets) {
         av_log(s->avctx, AV_LOG_ERROR, "WPP ctb addresses are wrong (%d %d %d %d)\n",
             s->sh.slice_ctb_addr_rs, s->sh.num_entry_point_offsets,
             sps->ctb_width, sps->ctb_height
-- 
2.52.0

_______________________________________________
ffmpeg-devel mailing list -- [email protected]
To unsubscribe send an email to [email protected]