Re: [FFmpeg-devel] [PATCH 2/5] avcodec/cbs_av1: Check leb128 values read

2020-01-18 Thread Michael Niedermayer
On Fri, Dec 13, 2019 at 01:28:07AM +0100, Michael Niedermayer wrote:
> "It is a requirement of bitstream conformance that the value returned from 
> the leb128 parsing process is less than or equal
> to (1 << 32) - 1."
> 
> Fixes: assertion failure
> Fixes: 
> 19293/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5749508361420800
> 
> Found-by: continuous fuzzing process 
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer 
> ---
>  libavcodec/cbs_av1.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

it is not once nor twice but times without number that the same ideas make
their appearance in the world. -- Aristotle


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/5] avcodec/cbs_av1: Check leb128 values read

2019-12-12 Thread Michael Niedermayer
"It is a requirement of bitstream conformance that the value returned from the 
leb128 parsing process is less than or equal
to (1 << 32) - 1."

Fixes: assertion failure
Fixes: 
19293/clusterfuzz-testcase-minimized-ffmpeg_BSF_TRACE_HEADERS_fuzzer-5749508361420800

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
---
 libavcodec/cbs_av1.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c
index ab006f4d11..16eb7143b6 100644
--- a/libavcodec/cbs_av1.c
+++ b/libavcodec/cbs_av1.c
@@ -170,6 +170,9 @@ static int cbs_av1_read_leb128(CodedBitstreamContext *ctx, 
GetBitContext *gbc,
 break;
 }
 
+if (value > UINT32_MAX)
+return AVERROR_INVALIDDATA;
+
 if (ctx->trace_enable)
 ff_cbs_trace_syntax_element(ctx, position, name, NULL, "", value);
 
-- 
2.24.0

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".