From patchwork Mon Aug 15 17:59:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37290 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1415741pzi; Mon, 15 Aug 2022 10:59:40 -0700 (PDT) X-Google-Smtp-Source: AA6agR6/S/qURKpa/70ku+gDCX5st3IBqVJE2WkUTahIKPh7Gn7nYr+g+tHX9WuZV+SmIeHeqd+l X-Received: by 2002:a05:6402:3583:b0:43d:6943:44a with SMTP id y3-20020a056402358300b0043d6943044amr15230829edc.409.1660586380332; Mon, 15 Aug 2022 10:59:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660586380; cv=none; d=google.com; s=arc-20160816; b=giu0Rj2JF7xWvW9tcAhBUmAWzu4DX5zCQk13B0jQGWjwg7Hih3W9chRngD8ascVQZF Z+K8GyKfJwS/tSLMD65H5RgF8iT2zTXxqEvxClH0gmWfeR9fgyTovGjjhxIl81vT2/y4 PdD6LVlD3nwOdx5gYr8TXiUuS8yL6eiiF2HY61TUz/Qp3mDSEr3yc+J2RFCOo5aNx8BP NpOHNxgJmOJaBaOrtXrut/OE8D1VEkTI0BM7BTe91j2MQACfwh+1BVilTAmam1ZJL1vq tAb6PkewjhCN9gPoPixMuGET+0gjshFxePeE7pLUOBmq/Vjk3QIrGWSWXFeLsO8rwFoO INlg== 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=s/IGBwQUeDz3q+T1nyJJo5kO2CowWrYGURJ1QgvH91k=; b=B6PWDqq0LSGjhof1rYchwIAXL1cWvDM+MdpV6S/514OT+7s0/HktRJ4UjqfXGG76IU b6h37QhOsmTfIoFDvbnbX3nGRbfknTOks8UYqu6iJizn8qvJlg1BqSYc1WBOP8DNDvOF 0RK5VO9V7bz05jDoC3TWyolUBR25g1JG/pnJWqEpbywOyDXG+PVM/m74J+b43IkccP0N Q+62VSE4LzYAe5j21pO5//Qn8kPCGiVQq0kZ17JUajb4BHZ2XMmlAyGizTj0UyRMqxGx fmYUgvfxiGQgxIEmguf5NG0BuZS0m2CwQGeFwVVasJ0fjrYZOtAO7PsS47r9PIyzXB7M LL3g== 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 l4-20020a170906794400b00711f4c750basi8978965ejo.940.2022.08.15.10.59.39; Mon, 15 Aug 2022 10:59:40 -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 348AC68B956; Mon, 15 Aug 2022 20:59:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 37CF868B462 for ; Mon, 15 Aug 2022 20:59:30 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oNeN7-0074A1-3z for ffmpeg-devel@ffmpeg.org; Mon, 15 Aug 2022 19:59:29 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id NeM6ooFBW8s8UNeN6oXvht; Mon, 15 Aug 2022 19:59:28 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id NeN6oZMDj8eSWNeN6ojpsg; Mon, 15 Aug 2022 19:59:28 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62fa8980 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=XJFLZRmqKwOHnJPfURUA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 15 Aug 2022 19:59:24 +0200 Message-Id: <20220815175927.8743-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfAwSYdGCOX8Py6pbTjDTCnfVrAHvRHE9MTcQm4zUUYdqioFW/gRAGUJMpS7gLMo+JMLtvNtftP1UpZI9Q9I6OdIxKQtASfMS1Kb13z1pCtJZFsXi76v+ GyPtAepA+PWldA2s3hHDLKJftRANpi6ZfkUjKl/Lsf2+HRQJPrzqd9hyYeuwwTpA5iLBKiJf9lscwA== Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/mpegaudiodec_template: use unsigned shift in handle_crc() 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: w/yxphsDLGmN Fixes: left shift of 192 by 24 places cannot be represented in type 'int' Fixes: 49577/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MP1FLOAT_fuzzer-5205996678545408 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/mpegaudiodec_template.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegaudiodec_template.c b/libavcodec/mpegaudiodec_template.c index a28cac9867..a711154a3c 100644 --- a/libavcodec/mpegaudiodec_template.c +++ b/libavcodec/mpegaudiodec_template.c @@ -374,7 +374,7 @@ static int handle_crc(MPADecodeContext *s, int sec_len) crc_val = av_crc(crc_tab, crc_val, &buf[6], sec_byte_len); AV_WB32(tmp_buf, - ((buf[6 + sec_byte_len] & (0xFF00 >> sec_rem_bits)) << 24) + + ((buf[6 + sec_byte_len] & (0xFF00U >> sec_rem_bits)) << 24) + ((s->crc << 16) >> sec_rem_bits)); crc_val = av_crc(crc_tab, crc_val, tmp_buf, 3); From patchwork Mon Aug 15 17:59:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37293 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1416319pzi; Mon, 15 Aug 2022 11:00:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR6DXMsJT2Yltx+BQIwAbHSkaIHVO8AFroxeqJ0/J8dA4YUzkvLgO/aWTBdmZ9rIOi2S87HP X-Received: by 2002:a05:6402:2691:b0:43d:ba10:854b with SMTP id w17-20020a056402269100b0043dba10854bmr15316841edd.158.1660586446336; Mon, 15 Aug 2022 11:00:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660586446; cv=none; d=google.com; s=arc-20160816; b=q8eop7yqHS5LSDMxILuwPcM1Zjz3YCskMLCmZa5WB8OGNynSXROjLfPiVrUHpdauap e7PyRK9AXtOTdPbj2G2z+zd30pGqmMPqtds0kBK/+M1JWIc3js8Sv+1O2eHw63uKKh0U 7u5IqPaxUieDanvTbl/9lDmacYVl1m/KzQApDnMw99j0Gwh2qm+uVXyKqdtDPeEVjIn4 doLO/Im928t2jU7wbUBfM5J0IyNmyqhzhzdAfsFSOGZM9DHMiFi0zayOahkU5VQ64H/Y hWMKa2omQgOk3O/3aS9owsD2VwbcE1dWjeZUsffx5flBvqtnQ++ygbWoRfkwdUgm5Yd5 F+zA== 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=ElL1ZM+Vxg+oTaKdwLQd4bnB31SpbQFJwOuwHOA2Y2I=; b=R5/MSbVFhthvFAzRt+8QuuDo0pUcmw1mSrwr2zj86nrwOujmLgXn2dfaFEFWJF7gVt FQI9snodY3oa6NFVZDXmF3/2Nj78yUhJFyxz70K73MDCmdAphO9/c1lWRTWYYRJt0P1Z 4xkH2gpSBmfcrIJSQcQTkHe1ghvdO0o5LJZ0EAO+wexZWI/QFv0jybpOn7zeN+Q/nIWD 5q+fr+hd5KAMO+2yVXR1/Nh2Z6Lh2vao87efBqtMc1q/NvCvOyKaA+vmfqSdulMLshE8 uqv+QLEHEnCDPhcEvuQ/+fG3R1r3Y65ZtdyGUF6qWVp7duPi9s9LEnW+3ARBTg20XOwh aR8w== 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 m21-20020a056402051500b0044276b7adbesi7449295edv.591.2022.08.15.11.00.45; Mon, 15 Aug 2022 11:00:46 -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 46DDF68B96C; Mon, 15 Aug 2022 21:00:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1CCB68B72B for ; Mon, 15 Aug 2022 21:00:28 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oNeO4-00CWtr-1U for ffmpeg-devel@ffmpeg.org; Mon, 15 Aug 2022 20:00:28 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id NeO3ooH928s8UNeO4oXvso; Mon, 15 Aug 2022 20:00:28 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id NeN6od1tuOPqFNeN6oLhb2; Mon, 15 Aug 2022 19:59:28 +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.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62fa8980 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=PjUK7NhsGhYFtEnob34A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 15 Aug 2022 19:59:25 +0200 Message-Id: <20220815175927.8743-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220815175927.8743-1-michael@niedermayer.cc> References: <20220815175927.8743-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGu65WP3J4gBBLP56OVgCfqhOscZ+RJ9+GJK4MREwB0R3cSGOmo01JxeoNq1VU4LNz5cpQN0xXbbNTnlq4lqMeySckLyuCZX76xTNyuj8yyABKd4tSTl G9nNtbJ7CVg07Slc2p4SOe/8oHLJ/0RJEMc1YbUep+C9ocEOcmQDq3s4kw9LyeAffpH2ZfrKyyVCvA== Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/hevcdec: Check s->ref in the md5 path similar to hwaccel 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: zxUUBPHTUEb7 This is somewhat redundant with the is_decoded check. Maybe there is a nicer solution Fixes: Null pointer dereference Fixes: 49584/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HEVC_fuzzer-5297367351427072 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/hevcdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index f1be8af2cd..477d6d9d36 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -3498,7 +3498,7 @@ static int hevc_decode_frame(AVCodecContext *avctx, AVFrame *rframe, } } else { /* verify the SEI checksum */ - if (avctx->err_recognition & AV_EF_CRCCHECK && s->is_decoded && + if (avctx->err_recognition & AV_EF_CRCCHECK && s->ref && s->is_decoded && s->sei.picture_hash.is_md5) { ret = verify_md5(s, s->ref->frame); if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) { From patchwork Mon Aug 15 17:59:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37292 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1416241pzi; Mon, 15 Aug 2022 11:00:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR7rbqVKQh60VK79auACtxclEbGNph3daZ7EE72H2F0pQx0tItfddSKS1vhJCetUSJS5jYtr X-Received: by 2002:a17:906:9bc4:b0:730:957f:34b3 with SMTP id de4-20020a1709069bc400b00730957f34b3mr10960056ejc.231.1660586438148; Mon, 15 Aug 2022 11:00:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660586438; cv=none; d=google.com; s=arc-20160816; b=0+/kor1rtKzkM0w/RMUO/ssFoL4XfA7i06XDZ7i44QZfeduVILgD+fHAWE4WoG9h67 ZX2UP7UKVCq4J3tGylFf5+XBkcmmjM56aC5oArNn9L92npLZMSs+5l75xVPif9/s8cRX M0Yoigc52O28iiHezKgV/zA8NRSL58e+bEw3idnP58ggN95WWW74ILK4fgI/n5g6sXlR 2vx+KcXDoOivKl25zilWEnSn0R1Aw5vuhEGzUnt2NwfxB5SVuWpLaIqm58No9TuTGo8O 1OMHCnfnPwNSqJE04kSKzS+Bs78ywbg9Fn0wg0yi+CyEL6KKyY0UQcsoHifvVqGx4+Fq /IgQ== 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=UVOCqnzQlUJ5lVFvHWYncQ4VuroeXICAmxaM8C8E0Ko=; b=XfWCiWXMujCQvAheAg1+MESPiKcAGPRlXi5kFYaPsZ4pgWrHcTbPjwGQiPRue1a1j1 E6VUZpVEMFN+vEzclMhjgUQ4udmAPRDDGMtWRWVcyn5UI1jiTn2UvNizVaZcH1nYsocR HNv2hQa92P2H05a95DPYwLc6Hq/JKcBgc6OHOqcB4DeMgJCEUgVd67FGonWfEDNMwQPT Z3jXXkUyTVcd2A07AWOFBVOHRt6hUTaCZxTQJCF1pPYqNCYJug4pkFrbycgfNaq31x5I A4/LSUV7cy1wcAOlQinwoai1Epq4DshaAHeE+9A+DBniH7AHKOsfDJ0TGjIrThQbiY78 gMsQ== 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 du20-20020a17090772d400b007313bdfb98bsi8589169ejc.18.2022.08.15.11.00.37; Mon, 15 Aug 2022 11:00:38 -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 5C68268B462; Mon, 15 Aug 2022 21:00:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D160868B462 for ; Mon, 15 Aug 2022 21:00:28 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oNeO4-00CWtv-1j for ffmpeg-devel@ffmpeg.org; Mon, 15 Aug 2022 20:00:28 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id NeO1ooH7W8s8UNeO4oXvsq; Mon, 15 Aug 2022 20:00:28 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id NeN6od1twOPqFNeN6oLhb3; Mon, 15 Aug 2022 19:59:28 +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.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=62fa8980 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=W9knaO9pGTC2wNZEHy8A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 15 Aug 2022 19:59:26 +0200 Message-Id: <20220815175927.8743-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220815175927.8743-1-michael@niedermayer.cc> References: <20220815175927.8743-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGu65WP3J4gBBLP56OVgCfqhOscZ+RJ9+GJK4MREwB0R3cSGOmo01JxeoNq1VU4LNz5cpQN0xXbbNTnlq4lqMeySckLyuCZX76xTNyuj8yyABKd4tSTl G9nNtbJ7CVg07Slc2p4SOe/8oHLJ/0RJEMc1YbUep+C9ocEOcmQDq3s4kw9LyeAffpH2ZfrKyyVCvA== Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/h263dec: Sanity check against minimal I/P frame size 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: 1Uqu9P/7KF4c Fixes: Timeout Fixes: 49718/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MPEG4_fuzzer-4874987894341632 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h263dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 8db0eccd89..c03a55a4fd 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -553,6 +553,8 @@ retry: avctx->has_b_frames = !s->low_delay; if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) { + if (s->pict_type != AV_PICTURE_TYPE_B && s->mb_num/2 > get_bits_count(&s->gb)) + return AVERROR_INVALIDDATA; if (ff_mpeg4_workaround_bugs(avctx) == 1) goto retry; if (s->studio_profile != (s->idsp.idct == NULL)) From patchwork Mon Aug 15 17:59:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37291 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp1415817pzi; Mon, 15 Aug 2022 10:59:49 -0700 (PDT) X-Google-Smtp-Source: AA6agR7/a9shm1U33w1csamuWwzKlDULR2UJ/ClajDkX+CGid452lYKtj3EVzmEAApjmNGN3HuQh X-Received: by 2002:a17:907:738a:b0:730:6d62:4ec8 with SMTP id er10-20020a170907738a00b007306d624ec8mr11216818ejc.590.1660586389534; Mon, 15 Aug 2022 10:59:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660586389; cv=none; d=google.com; s=arc-20160816; b=HcMrNvyUHD4EDRKZaclXq2I5K/8V2rVWEn4KBbLO4vSkgAukiCrpihNwpxVz7H+lYz 7+8ENvn3vAuH+tHeHs7uANw27bnhZV1pH/bQv+DfNnSHee37KRnut8oOPj/0X/hqBR5a WtTUYMoBZDCUBWwP2K1vOda77N3FqRqlaZIwdom0+6jKbssz5fg8XoyfhY+naOisdhAs 0LgQOHZSodpoPoistV9O2BaqWVth77IsjFpjZlPZeqQI+z0gDGmwlIPgeygyS844DW1U OQsduLJbHWlhuDJ3aW4PDi56voTbbx2Y/ckdrq0TNF/VbaRE2x7oHl8v2pZyvcYwITNd 9cXw== 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=568hZkrOFTQ9Gzwv7tXUBgzqtVv6jxrBpREJ19+wF6Y=; b=s8nV0NiwqwFGOm7UszfHvWNjoYYxEqryUMDJu/H/kdmw7ffzGScLZotMTOZa4LiTtN K9L/WIW7kDv4u2HfWHKE0yUglhivzp070NU4xq6op6/2jYxBq9u5wo7pkM8E81FZrVaz GO87hhjsQX07jREf9UkBtGYDTM8t/RF9XJ682t7AhLPqBQgzhv1LSJqfCM7B+aJ4kXPd WPcUBD6HpRQQ+/rXWvHM6sD7XtfEWbuXfZ4RJ9KyaIiQ9tiNKsE3WDcQE2/rUjae1LP6 bNQ7HnhjPF9bR1pnq/x9aC+9SllxNRQbRiYREbi6fMecC7X9yIzbpawyMqcJMftPb/bJ 8XWg== 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 h6-20020a05640250c600b0043d56e0c95asi9825093edb.585.2022.08.15.10.59.48; Mon, 15 Aug 2022 10:59: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 3883A68B964; Mon, 15 Aug 2022 20:59:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at02-2.mx.upcmail.net (vie01a-dmta-at02-2.mx.upcmail.net [62.179.121.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3993468B8D0 for ; Mon, 15 Aug 2022 20:59:30 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at02.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oNeN7-0074A1-7z for ffmpeg-devel@ffmpeg.org; Mon, 15 Aug 2022 19:59:29 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id NeM6ooFBW8s8UNeN7oXvi1; Mon, 15 Aug 2022 19:59:29 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id NeN7oZMEH8eSWNeN7ojpsk; Mon, 15 Aug 2022 19:59:29 +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.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62fa8981 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=k5EBCU1x4CGL1LU6UjgA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 15 Aug 2022 19:59:27 +0200 Message-Id: <20220815175927.8743-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220815175927.8743-1-michael@niedermayer.cc> References: <20220815175927.8743-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfAwSYdGCOX8Py6pbTjDTCnfVrAHvRHE9MTcQm4zUUYdqioFW/gRAGUJMpS7gLMo+JMLtvNtftP1UpZI9Q9I6OdIxKQtASfMS1Kb13z1pCtJZFsXi76v+ GyPtAepA+PWldA2s3hHDLKJftRANpi6ZfkUjKl/Lsf2+HRQJPrzqd9hyYeuwwTpA5iLBKiJf9lscwA== Subject: [FFmpeg-devel] [PATCH 4/4] tools/target_dec_fuzzer: Adjust threshold for ZLIB 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: o5e6Zt0fvRnE Fixes: Timeout Fixes: 49769/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ZLIB_fuzzer-6302938657587200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- tools/target_dec_fuzzer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/target_dec_fuzzer.c b/tools/target_dec_fuzzer.c index e1b5d2b3c1..28042077c6 100644 --- a/tools/target_dec_fuzzer.c +++ b/tools/target_dec_fuzzer.c @@ -298,6 +298,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { case AV_CODEC_ID_WMALOSSLESS: maxsamples /= 1024; break; case AV_CODEC_ID_YLC: maxpixels /= 1024; break; case AV_CODEC_ID_ZEROCODEC: maxpixels /= 128; break; + case AV_CODEC_ID_ZLIB: maxpixels /= 4096; break; } maxsamples_per_frame = FFMIN(maxsamples_per_frame, maxsamples);