From patchwork Sun Sep 5 19:24:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30010 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3153171iov; Sun, 5 Sep 2021 12:25:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7xpt3bluRdtxkz2p9EOlZbBVaY77M/wj0A8TjGuzUHxVc7ME1cW8KMWrCsKtF1fGDjO6u X-Received: by 2002:a17:906:d183:: with SMTP id c3mr10094429ejz.283.1630869930731; Sun, 05 Sep 2021 12:25:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630869930; cv=none; d=google.com; s=arc-20160816; b=Frgp3onn5TR8qgb6HKg2gBz5id3iAfXAu9sxBP4Ei9vT0uOmSRR1LXh4OuzyeYW5FQ fW+G/Y0GoZL7xSp/scgpMvFPwzybGhrimXViQP1Uu2RQVR0R5t5z8sdYeFVATAR0FWWe kLoIRfYOldmRGHyKvPeOG84AHNJM9WoqUcS6wkdHWeQtzC5Y8GbBp+3KJt2REgqyhFr6 SJeS2Fosz3a/qWiO0V6k//M/7ypYKgqPlsMQ92RJro8wbBNVOT26VRVJYpotGvFPA/w0 X2tHubLeSy6/Tc/tcHqkoJygPXF97WwAVPyIi55JAG62x0ROxIzPEby82QPVohItbszN db2g== 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=SFzJVHpagKJ7RC3bwKP37p04p2pdOIiD83hvzCYJxY4=; b=nJG5QxIj5gSGeuFNdzZfemXNhGDfrLGpKjyqLqPHwXlNuIBxUlrXBGtU2URCVv8lYP FlogqNnpNbplbFZ6g9UeO6HQqs6GxYFep0pa6D+c3ZyF1fa+05pTJ16m1h9u56rt0Yey t8h7paTigMO7pAmQ50/cl5LZ+n8j/F5IlZMg5rtmfONz9bOTD/obAPR87fFXBvErbXc7 aoRU+3pI6N4hmJWpOjv5ety6c2mLasARS8Ro2b1vPvZV38nC6FrrfdOFSSHaWEKbS2tM w9uKgVRzdE0K6oZnZRLuXlB3o+9iC83AA0EMnSjaQ75XoIl/L9Dn5wkjVXyfGXZgYKEr nAeA== 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 b15si6289990edd.273.2021.09.05.12.25.29; Sun, 05 Sep 2021 12:25:30 -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 63E1D68998C; Sun, 5 Sep 2021 22:25:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E48CC68090E for ; Sun, 5 Sep 2021 22:25:18 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mMxlW-00CY5C-8N for ffmpeg-devel@ffmpeg.org; Sun, 05 Sep 2021 21:25:18 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id MxkYmmGISljeHMxkYmkPF1; Sun, 05 Sep 2021 21:24:18 +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=_3VL72PE1gnvx--_xu8A:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Sep 2021 21:24:15 +0200 Message-Id: <20210905192418.25970-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfJg/6YdBNNcXgRPbRd54Plv8bUq8I0GsOM4aReM1yfeoWxA+oe/Wo8/Ya5iikLvv0Ey6P+rTIp0jgztKeADkFwNyvYS2aEjZKNFQHisx9Xi0u4fkVC5y ET6TakizHLP4DwuX6bd9sBssntWjO6ApDJmr8G+S08PmFpQYylHcTGKA Subject: [FFmpeg-devel] [PATCH 1/4] avformat/mxfdec: check channel number in mxf_get_d10_aes3_packet() 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: 0ktipkr9kNNn Fixes: Out of array access Fixes: 37030/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5387719147651072 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mxfdec.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c index 55f2e5c767..ebe411b04d 100644 --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -552,6 +552,10 @@ static int mxf_get_d10_aes3_packet(AVIOContext *pb, AVStream *st, AVPacket *pkt, data_ptr = pkt->data; end_ptr = pkt->data + length; buf_ptr = pkt->data + 4; /* skip SMPTE 331M header */ + + if (st->codecpar->channels > 8) + return AVERROR_INVALIDDATA; + for (; end_ptr - buf_ptr >= st->codecpar->channels * 4; ) { for (i = 0; i < st->codecpar->channels; i++) { uint32_t sample = bytestream_get_le32(&buf_ptr); From patchwork Sun Sep 5 19:24:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30011 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3156615iov; Sun, 5 Sep 2021 12:31:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxXJIXaz+Xf4A6FnekVEPcajotWn3/o4BObEgGpl0QIj5c6V3OO7ybHc6/RmrRpTouf4HS X-Received: by 2002:a17:906:9b87:: with SMTP id dd7mr10262720ejc.99.1630870306971; Sun, 05 Sep 2021 12:31:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630870306; cv=none; d=google.com; s=arc-20160816; b=ZjoOer8LJ01MLoggUONletde+Kk7tEYhISpRXUW6YbfBJyzAjSjexlFr4+Vj+mrnqK FSH4scXop0HmOxx+rUilitUx/RngUE/TmALKLULtbTYL+mZeTXVrRyt741+5ITnlCjV9 NK2Bj3vIEAQb3QrZogtJ8I3zxrdf+TkR0U7ypkgGEVOdj97Gt+ujRFqNX1BohU1bGyCt WSH3y/zJTyvvzthkE5kV+yZQkGEaghQde6un4nlbBRSlScrm8zSppRivb1H8E1o6xbjs ZAd7UNvM4h3PmjY9ZKeecOHT/M39vwzSTqk/Eq832KvZaqFWyruYi4hC23gt+NUPZ38M HsRA== 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=wpP+V9A3vJt37SUSp9c/8qvcmOKqCku5q5z+B4w0Kos=; b=Y9oEjhDHXCm6M9x8oG+xDcGS5IkuP9W6l1fPf3e9Qf6HNPb1Hh45DrUpwD1G8+Ulbb mnAh+Qpq/F5U7xvCd7YAkDTridu5ddu80yfjPO8hXNjiTA28liw3ot4sgyFdcweyStwA 2JdXZi3+6O36NSjCrkVllRVYlnVCRkg5z7wlW18PUm2cy5/F6e54EIKlv5s6Q8rK+Ua9 YCKlFmuPLBaruIPWhP/zh9p4gwg/9BPOpcqNpSCWnv9/n8Y2/Z7kDKgAM4BjkbUKzbTN 5lgMaX5gVskwIZ/Q+Hsefk9uOYMSSczfH2UbQFPavL8Jb24O4SgNFYVwXXcK4FLXPklZ etvw== 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 c72si6157093edf.101.2021.09.05.12.31.46; Sun, 05 Sep 2021 12:31: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 D413168A67E; Sun, 5 Sep 2021 22:31:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-2.mx.upcmail.net (vie01a-dmta-pe03-2.mx.upcmail.net [62.179.121.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B72806806F5 for ; Sun, 5 Sep 2021 22:31:37 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mMxlW-009MU6-8O for ffmpeg-devel@ffmpeg.org; Sun, 05 Sep 2021 21:25:18 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id MxkYmmGJjljeHMxkYmkPFl; Sun, 05 Sep 2021 21:24:18 +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=HZGD4XvvAt8j1vcZr4UA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Sep 2021 21:24:16 +0200 Message-Id: <20210905192418.25970-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210905192418.25970-1-michael@niedermayer.cc> References: <20210905192418.25970-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJg/6YdBNNcXgRPbRd54Plv8bUq8I0GsOM4aReM1yfeoWxA+oe/Wo8/Ya5iikLvv0Ey6P+rTIp0jgztKeADkFwNyvYS2aEjZKNFQHisx9Xi0u4fkVC5y ET6TakizHLP4DwuX6bd9sBssntWjO6ApDJmr8G+S08PmFpQYylHcTGKA Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/apedec: Fix 2 integer overflows in filter_3800() 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: vfQTqfgGXAhT Fixes: signed integer overflow: 1683879955 - -466265224 cannot be represented in type 'int' Fixes: 37419/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_APE_fuzzer-6074294407921664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/apedec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c index 022a6f9398..bf481ba354 100644 --- a/libavcodec/apedec.c +++ b/libavcodec/apedec.c @@ -909,8 +909,8 @@ static av_always_inline int filter_3800(APEPredictor *p, return predictionA; } d2 = p->buf[delayA]; - d1 = (p->buf[delayA] - p->buf[delayA - 1]) * 2U; - d0 = p->buf[delayA] + ((p->buf[delayA - 2] - p->buf[delayA - 1]) * 8U); + d1 = (p->buf[delayA] - (unsigned)p->buf[delayA - 1]) * 2; + d0 = p->buf[delayA] + ((p->buf[delayA - 2] - (unsigned)p->buf[delayA - 1]) * 8); d3 = p->buf[delayB] * 2U - p->buf[delayB - 1]; d4 = p->buf[delayB]; From patchwork Sun Sep 5 19:24:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30009 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3153269iov; Sun, 5 Sep 2021 12:25:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtUt0jjRqWpXDlNuod7ITr5/CZSAtF5xDDQAqJI74QDUcydmOxkH0ygBEvLlgRmXEU56gY X-Received: by 2002:a17:906:c52:: with SMTP id t18mr9981625ejf.148.1630869940924; Sun, 05 Sep 2021 12:25:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630869940; cv=none; d=google.com; s=arc-20160816; b=UE29tG3LafzT0QOtmExdyJl3rDgbPIYFvL/oQ1X9t9vtDbLZrtIi27mgqcK9NdxwPE j51z1A3rsZv/E9rtWNfzn5kmrNPQFyF5K0OJY3RXD/CIjzur4L48jW0b6hLbPTzMjOZm wzQErOIXTYDZDBYLIEL0vioBjlfkgywa81/wk0f5vThVRhYUfnTpLqVwNoO8YqrxsPpE JNZbivrk9HLcKUnVV9Wcz69wztVxs4idFVBz6xNwyjLbNTE0WnsXUBxaQh057ScbrnM6 YBjTNo7SOWZBq92FdpEkMuPPRNTHY99F/cGMyU2t+6efKZ/obCwr5RhfByYqmgZh4xUb vEng== 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=/6rdYaFvxOlLf2eAawc1O1imJ+H5DcsWXBuEQ3atIhE=; b=zQM559mf5SxPmWQc2Dv0cEp3xm2UAgb3oCmZb0qCfwi/R1zBLaFwXsMacLjcBt9i6o NdhRbklU+YjJzYjsgICYSNy8v7pCuuCu0/kRpR8ma4CI2+RKhIeDFrLxphkvARzEnWGn NWdxYe4ndD6DEpCNapwiiFdfsfdObjtBaAZsa3Qfqz7YLB8y2q+7TQkpJSRqyRtlzbN1 gjgvrlbt77RXR6Zmert4yLSb0BVbL4TRecRH6RzWSP00r0SIhQMT37Nyo2x40wsS84NN Qy6VWUfTNZ/hYbabvtmIlvKVxs2jQozCfrALU/8GSecRiO9YeWB6vadOP7j4fbKHMvSh 1TXg== 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 c2si6421162eds.210.2021.09.05.12.25.40; Sun, 05 Sep 2021 12:25: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 65EA468A62A; Sun, 5 Sep 2021 22:25:26 +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 4821268998C for ; Sun, 5 Sep 2021 22:25:19 +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 1mMxlW-00G11W-8O for ffmpeg-devel@ffmpeg.org; Sun, 05 Sep 2021 21:25:18 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id MxkYmmGKBljeHMxkYmkPG0; Sun, 05 Sep 2021 21:24:18 +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=6tO2eCvWnai8Nwv4QPcA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Sep 2021 21:24:17 +0200 Message-Id: <20210905192418.25970-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210905192418.25970-1-michael@niedermayer.cc> References: <20210905192418.25970-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfJg/6YdBNNcXgRPbRd54Plv8bUq8I0GsOM4aReM1yfeoWxA+oe/Wo8/Ya5iikLvv0Ey6P+rTIp0jgztKeADkFwNyvYS2aEjZKNFQHisx9Xi0u4fkVC5y ET6TakizHLP4DwuX6bd9sBssntWjO6ApDJmr8G+S08PmFpQYylHcTGKA Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/h264_parser: Fix nalsize check 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: Q4JZwunOXB6p Fixes: Assertion failure Fixes: 37463/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_H264_fuzzer-4914693494931456 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/h264_parser.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c index 01ea016409..47cc1d5c78 100644 --- a/libavcodec/h264_parser.c +++ b/libavcodec/h264_parser.c @@ -87,7 +87,7 @@ static int h264_find_frame_end(H264ParseContext *p, const uint8_t *buf, i = next_avc; for (j = 0; j < p->nal_length_size; j++) nalsize = (nalsize << 8) | buf[i++]; - if (!nalsize || nalsize > buf_size - i) { + if (!nalsize || i > buf_size || nalsize > buf_size - i) { av_log(logctx, AV_LOG_ERROR, "AVC-parser: nal size %"PRIu32" " "remaining %d\n", nalsize, buf_size - i); return buf_size; From patchwork Sun Sep 5 19:24:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 30008 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3153336iov; Sun, 5 Sep 2021 12:25:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxTxneudbY4U+iHdT51Nxo/zkBAdWyWll0e4XpLgITexFiGK48OOvh6lGh12TYBi9PJ1Tvm X-Received: by 2002:a17:907:3f91:: with SMTP id hr17mr9986468ejc.496.1630869950226; Sun, 05 Sep 2021 12:25:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630869950; cv=none; d=google.com; s=arc-20160816; b=HJ8iH4lbE+0N8MaUbglX+oRgCJCnsH8HTrNN+6nolxTi7e3RDwLys/65XkYqeboiNP Je7Zl37lKtGtpv2tE9KJPJwcaJUvdY62vVwWH1huJsbqpwPyJz2V+WgUMPbQJkRGqPuI Etd3lXbDT+E026k/FOqUTXvXc96dQXhS2ZKRx8JcboXQD7PPuBvFSilRea+u+OOXQ2sn o3Gu8RR/Y/WpCgZTpkDVfGfZty394GcId7GmiphbyTbV0cClAAPGun3flSuzJIayxEOw sLgcMEDi2sQ8XStjSp/sRNZi5nbuzHrCSPSsEMJE3MBuhtdDM74W3rPmr727CaNwWjlT tfCg== 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=T7PnOW7bKpz8dsA043wt5uF6UiFkBM++vSh7aB1cR5k=; b=tbu3pCykmM6l16lwBGlwavH6DWpPXiGYPUkuuzNPK8WGbVKFc/HBOJR+uOxynDyYf/ 91kKaPSsMwAJusT1UlZ0IIDS74tkdZeehwQlz5WNcH4PS8Ej+1Jk4huFg92KshHa/iXg mBzs2+oHLZT5AT/pIvfvdSiwNphKnpHLlhw8nSlw0ZSIz5cOZa9e+Hu0slZh3QkxcCXk pUud6u1FsiCZLC37TdLa/p79TTXjvSSIpea9VIbEEmiRRCecChMt9BWDL7TYUJS4HXOb k4QjoSyxvrKXcGME8QYTXZydFJx0RVdeDB3y2hkDikgSUqZYXda4MmZVqtRNPhY6OFKJ +TNw== 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 h16si5987948edz.437.2021.09.05.12.25.49; Sun, 05 Sep 2021 12:25:50 -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 6AE9768A637; Sun, 5 Sep 2021 22:25:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75EB368998C for ; Sun, 5 Sep 2021 22:25:19 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1mMxlX-00CYd8-8H for ffmpeg-devel@ffmpeg.org; Sun, 05 Sep 2021 21:25:19 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id MxkYmmGKfljeHMxkZmkPGE; Sun, 05 Sep 2021 21:24:19 +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=tsPA6si9V2nU2mv4JUUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 5 Sep 2021 21:24:18 +0200 Message-Id: <20210905192418.25970-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210905192418.25970-1-michael@niedermayer.cc> References: <20210905192418.25970-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfBUrUFtFewveXurTMd+9z/U8rFCInWG36VH9qzqQEiiwD8E0KFMeKd1QK8XW20SNvRFCm8Yf6Gmrq6qYojF8FOZKEHeUYOe9ngdXQnjI9xBF3vuDKt1L ABZEOwWVJ6GGSOFmU8o/AgjGrEw+2uo1PHDQyzVX+QqaZzhz9+C0kB+z Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/jpeg2000dec: Check that atom header is within bytsetream 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: aD1QC0rjs+6M Fixes: Infinite loop Fixes: 36666/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5912760671141888 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index e62f7b19e6..c95f22bc90 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2360,6 +2360,8 @@ static int jp2_find_codestream(Jpeg2000DecoderContext *s) atom_size >= 16) { uint32_t atom2_size, atom2, atom2_end; do { + if (bytestream2_get_bytes_left(&s->g) < 8) + break; atom2_size = bytestream2_get_be32u(&s->g); atom2 = bytestream2_get_be32u(&s->g); atom2_end = bytestream2_tell(&s->g) + atom2_size - 8;