From patchwork Sun Sep 19 20:35:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30375 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp899024iob; Sun, 19 Sep 2021 13:36:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXuEHiEzyfnUNLDKepVKsexpKSFIA4PogVB+WCbx36OPx+ijBPB1IGTOA1iqcwsE2BGbuR X-Received: by 2002:a17:906:9395:: with SMTP id l21mr24517873ejx.308.1632083818709; Sun, 19 Sep 2021 13:36:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632083818; cv=none; d=google.com; s=arc-20160816; b=A85Bq6ZcoOLrFi2E70A6GMuat+mtkvuT8Ogg3zOMSEsiJpi6L33HiLZ5A7IIhttzwV KcC61ki7CKRZfLYFOXJtCwoT1QfMaxmVwPyo5pLQOcoYgf/XGhJsJCTWAc8HL+jTIKA+ a84ffwsQrV2A7MPMoU//Sam2fb01K0scQe8eBUBPR46BvwuN3ugXZ+m4knITZuS4lWS5 keBHjUHY4pRsjuVZgy/HD+3MNipckg5MWsKq9Cfpb5QI10a63FmEceqTE4grkX1fe2rn QxlMp7F3oHk1OSn/wlvDVyuGGiHc/Z2CL8ehD+O+78PzxKcHEUlDkUrSt7dyUxyFQXZp nUUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=vU45xLvFz6mTaiAIZnYZI/KxWWpPcqPW9g5omyxMwdQ=; b=f3Xk7tfKmffRIdR0JDSHOmONfjqhNZ5PVFroK3PiDywZTfiqVdUHkzurp/8Uj2CQXW Sy+E2qomlyYXEKSukUanptHT3e18leW8rmz7WrLmw2QJ3+feWrvZ7j/pejfBsh2O6ft+ BPkAmi3p0+Sz0i1Vb+9bghLKNbEi817Nf8SS/kwaGfnJla0RZ5TYcHZ9RuHDfGh4CRQJ rNOea+DyTCk+OqgWj/kwKcevo6rnkY/N9SWf1yEFWT/Vqko0dF9Ko1ANhqUD96A2DPpY 3tOASn4N/OAW1mZiqbDrgbo0Ue9GEQlR/SYOC44O0906iiGAaX6HFGbALvQWomf/g4JZ 0TXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hq3si20588134ejc.142.2021.09.19.13.36.58; Sun, 19 Sep 2021 13:36:58 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9577E68AF0D; Sun, 19 Sep 2021 23:36:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B54268AE7F for ; Sun, 19 Sep 2021 23:36:38 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mS3YD-008FCw-0B for ffmpeg-devel@ffmpeg.org; Sun, 19 Sep 2021 22:36:37 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id S3XFmyH6RljeHS3XFmAk2r; Sun, 19 Sep 2021 22:35:37 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=U1_NXLI7QO_aaahV138A:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Sep 2021 22:35:35 +0200 Message-Id: <20210919203536.23964-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfLuwuZpiDOK/sjNxJ31dnHnQQIevtvIvgQFtMYtGiqjW7affq3zPXahjyJfRkrS/C52cnhkQeSJo+5VvDbDY/WrpeCRhSfXM5R5mpFz7Or2/MbYQafoV rvb1AWifhNOhRNV2ymsRbnmt9aApYdHbM9MROVVb227NOzEU6OJl+p2l Subject: [FFmpeg-devel] [PATCH 1/2] oavformat/avidec_ Check offset in odml X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lw0qjhwVm5sI Fixes: signed integer overflow: 9223372036854775807 + 8 cannot be represented in type 'long' Fixes: 38787/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fuzzer-4859845799444480 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/avidec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 3eb5d4dff5f..1e8efc13060 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -244,7 +244,7 @@ static int read_odml_index(AVFormatContext *s, int64_t frame_num) avio_rl32(pb); /* size */ duration = avio_rl32(pb); - if (avio_feof(pb)) + if (avio_feof(pb) || offset > INT64_MAX - 8) return AVERROR_INVALIDDATA; pos = avio_tell(pb); From patchwork Sun Sep 19 20:35:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30376 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp898962iob; Sun, 19 Sep 2021 13:36:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpoSDqk8a1Tyhjes9iW1cui+bgmiRmQGjaZA5WcJhpBLddunHHqLMRMmT6Ynd8sRyBibfD X-Received: by 2002:a17:907:3e21:: with SMTP id hp33mr24738783ejc.205.1632083809353; Sun, 19 Sep 2021 13:36:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632083809; cv=none; d=google.com; s=arc-20160816; b=LtqzrV7/I2014iOduELImsO12Tw6soJPllZ4FoMjg/F7vkb8UCR0ZCb794fD/ajSJ0 9CeCVwKiOQWQRkuhCY82Nd82cGg4jBX1Y3NMz7SEfCCuTNdh+cbRRFVCirnpV2n2VtPF u6KUUKXaNuPR+e94KKkChAEJJpFp/LHtxITIBsXoR39tqhgfawVgwsZwjFM3SpfHkhxW BnUgabcyIihSWVIfntE9M0NHC30CBOhfZUBa9YBwYY/aWj/rENYs5sR84URp1V+rHPJx JT/RSi/W1wxf0/FoadJbsC1oylY8MmkrUNeTI314YBhY3o4T7/8ld26XwoziIYt6VMX5 mqXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=vcUjLsVHIbaNWCNPj35JsWfzIOigPWwL38Tpu+nMAH0=; b=ewf59o8oIXUUnM+P913eOqChZXxee/BfuQHXs4+KtafF4P5UaJ+ZlR33EpM1TXs5ve DATZEifY7FZJDouPbAMINgkhCBiKu6wRoYHvO3ckPFWrdF1zkKmcWgMSzwmHmuUGc85r SCVUqIBldgoEXac+0FqWoczg1aZRPlcs+bciTw6L+vXfGd0d//pDdhXr0ZF9bHy7EqN3 UA7cS8TwKEdb7wFAU3e75ZGR4xGE+bWjTqWaCn/PyCTG4jciY249L3/g9Y/E5TyG7dMp CrA4X+srAm9DQ1BoFExjxu8jkr7ZMhH7qU513jvVx1wqRg3kJ5jjYPkh1cjZOAC+/Rrb jUXQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b25si15804667ejl.528.2021.09.19.13.36.48; Sun, 19 Sep 2021 13:36:49 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E21868AF1E; Sun, 19 Sep 2021 23:36:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-3.mx.upcmail.net (vie01a-dmta-pe04-3.mx.upcmail.net [62.179.121.165]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17C6A68AE7C for ; Sun, 19 Sep 2021 23:36:38 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mS3YD-008Emj-0B for ffmpeg-devel@ffmpeg.org; Sun, 19 Sep 2021 22:36:37 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id S3XFmyH7OljeHS3XFmAk3R; Sun, 19 Sep 2021 22:35:37 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.3 cv=BoHjPrf5 c=1 sm=1 tr=0 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=GvCQulWbp0F2UX8GxG4A:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Sep 2021 22:35:36 +0200 Message-Id: <20210919203536.23964-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210919203536.23964-1-michael@niedermayer.cc> References: <20210919203536.23964-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfLuwuZpiDOK/sjNxJ31dnHnQQIevtvIvgQFtMYtGiqjW7affq3zPXahjyJfRkrS/C52cnhkQeSJo+5VvDbDY/WrpeCRhSfXM5R5mpFz7Or2/MbYQafoV rvb1AWifhNOhRNV2ymsRbnmt9aApYdHbM9MROVVb227NOzEU6OJl+p2l Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/cbs_h265_syntax_template: Limit sps_num_palette_predictor_initializer_minus1 to 127 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8LaLOfA3j8pt Fixes: index 128 out of bounds for type 'uint16_t [128]' Fixes: 38651/clusterfuzz-testcase-minimized-ffmpeg_BSF_HEVC_METADATA_fuzzer-6296416058736640 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/cbs_h265_syntax_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 67bc77f9751..fb8ac4a4a77 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -728,7 +728,7 @@ static int FUNC(sps_scc_extension)(CodedBitstreamContext *ctx, RWContext *rw, flag(sps_palette_predictor_initializer_present_flag); if (current->sps_palette_predictor_initializer_present_flag) { - ue(sps_num_palette_predictor_initializer_minus1, 0, 128); + ue(sps_num_palette_predictor_initializer_minus1, 0, 127); for (comp = 0; comp < (current->chroma_format_idc ? 3 : 1); comp++) { int bit_depth = comp == 0 ? current->bit_depth_luma_minus8 + 8 : current->bit_depth_chroma_minus8 + 8;