From patchwork Wed Apr 21 12:31: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: 27206 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp357160iob; Wed, 21 Apr 2021 05:37:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzq4uorTkQX4hcw/d3+yUzMx+KJ+ItQKjozBdz1jW6pXDtdRRA0OpyRZ9IFA3aHO3ziKHVP X-Received: by 2002:a17:906:37d7:: with SMTP id o23mr32313420ejc.202.1619008663092; Wed, 21 Apr 2021 05:37:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619008663; cv=none; d=google.com; s=arc-20160816; b=EkIg41KWewFyK9Yq3yu2pVs4BjyvXsc9mF93xG+tC4iLZmcDcsEhbhDGm2vYFFZ9nw Gd/DtqshWqD54tep4lhnhKvGZWvygVP00TXeH8TqrsVjTgFioT4b51OYSwsg7tic645u UXMx3s/iOGfPJTjShKSF0jzfo3e1N1IHiCAEWehnRzryNZiAgsefqbdzsZdX01GyMA3H +EdwM5GKMSo5jXTNvmEE5H/f+11CeRUwW0eGZAzGiOyWQiSfJr1VV0PmeoBHKJ3xlMnh x/Ibv48xvQStzcvY58eEVJYn/M8JIwcQUY5VXz1DZ00z2ubOn8NPOb8sq0uo5v1RyoDV EJQA== 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=KJKYJUMHR3uIeySh0m4PkFXEYwmdnynPaa1MsQPm9q8=; b=sRmUZgvVG0q8Bi+ahFlO+EXZ6Tzy8K0ASqhFLXImIYpVNUPRnT5fKmSxge4o/ceAtT KrnRkvCamgIHGmp4KD9wCjIWN3ln2pxo7oG1cw1Q0JNZ6J045f46s4vF21QB+j107cc2 UH8St6asTECqFQTLt60Q8tqfMvocj+E/+ahCRXawrYZeFcg3qIMVjIjQ6LqGdPHGyAq8 d5fniRbbBeWzuWdnt6fvC53+BGh/vhroN2PtI+4Znj14vpsWJZyvmhRAlw9RCN6C3A+d w+luZyOH8qb2IW1OCyja8S4vmk4+ybZVmiCLr5d1GVUrZFecwK/jzX7owJNGARxpbCuC d4fQ== 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 y7si1968516edv.77.2021.04.21.05.37.42; Wed, 21 Apr 2021 05:37:43 -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 0B240689B83; Wed, 21 Apr 2021 15:37:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-3.mx.upcmail.net (vie01a-dmta-pe05-3.mx.upcmail.net [84.116.36.13]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0A4C6891DA for ; Wed, 21 Apr 2021 15:37:33 +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 1lZC1i-00Dfcb-08 for ffmpeg-devel@ffmpeg.org; Wed, 21 Apr 2021 14:32:18 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZC0klBSIaljeHZC0klEVVR; Wed, 21 Apr 2021 14:31: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=Wy6r4lI0QzNypaFTXDUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 21 Apr 2021 14:31:17 +0200 Message-Id: <20210421123118.17901-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfLW94KnPNDi781yO5L7iVYl9mor1yKfLhvrmuX4lkP8Qr+epEmB/yPKlFZgTvIv5LfvW1CZT0pFmD7kI4fbRkPyJSQLXm9Cv/SutPaAblPxuEVZFWWSd ogBtKMvCRd7zFY6IbT1c1pcQPHL2ppbpNqtBeb5jHgQCsyTOgLlvpGXl Subject: [FFmpeg-devel] [PATCH 1/2] avformat/mov: Avoid undefined overflow in time_offset calculation 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: jKx9G3zVVkI5 Fixes: signed integer overflow: 8511838621821575200 - -3954125146725285889 cannot be represented in type 'long' Fixes: 33414/clusterfuzz-testcase-minimized-ffmpeg_dem_MOV_fuzzer-6610119325515776 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/mov.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 9ca1ac89a8..ecca73a1b8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3822,7 +3822,11 @@ static void mov_build_index(MOVContext *mov, AVStream *st) if ((empty_duration || start_time) && mov->time_scale > 0) { if (empty_duration) empty_duration = av_rescale(empty_duration, sc->time_scale, mov->time_scale); - sc->time_offset = start_time - empty_duration; + + if (av_sat_sub64(start_time, empty_duration) != start_time - (uint64_t)empty_duration) + av_log(mov->fc, AV_LOG_WARNING, "start_time - empty_duration is not representable\n"); + + sc->time_offset = start_time - (uint64_t)empty_duration; sc->min_corrected_pts = start_time; if (!mov->advanced_editlist) current_dts = -sc->time_offset; From patchwork Wed Apr 21 12:31: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: 27205 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp353223iob; Wed, 21 Apr 2021 05:32:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkne3YSI5hYItbECasMVXgCAt+pqrRIUrpMo4e5ePpQdl1K86YnmMxebiRTFxRQ20IEizp X-Received: by 2002:a17:906:85c1:: with SMTP id i1mr32939999ejy.216.1619008348704; Wed, 21 Apr 2021 05:32:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619008348; cv=none; d=google.com; s=arc-20160816; b=mEGjy4XBIui0dppy9BxWstFq87sv91uSKHnhBM5Y2AiK6xrwr86OID8if7PEiS9alw 2XliwN50y9QdkFIKZwhR2Nb+h9DpU6LoMigEoezo63AawofA1XMWMsyFG14J1H4sWZ70 nX8gV2KLMO7FL3J0BHFHrHApkK66alotf7EoB7LCXDY1yE72Q+0mYzWQapQ4CFI3TvpJ jTpsG5y8+zfoGdpvIzO5BZ+6IQhUCJ+XAegk6cODbkfuIRhad6XWHlqsaxE66S7AFBTQ QzZ1UBETz9x+8qmIYlhJ1Ah47cdEbcu2VQ3/soIIBjxfp6pV+tjYAZrbwcT3yXFaHCjt Fk4A== 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=hJ9eGIySMBIP4o7/N6C+zTR3XhglpWdyN7l2oacHBtE=; b=yYy/R7dGEyMS6kUpBu8z9uHwC155lOc185Rq6OqTzjgssjyTMZTe5USLD6aZy+Zgvv g4OU097pjdVNPQEe+jy/MmeS0ncfCxoHUhQnoWl2VqH0c7XNAjY1zpXWYXDPETQBq9bt IzZP3qN0mexNVTO8QDMgMDcGWQAyxECQWXRSd53NQNdo2FPl5vSwkdHu3RwtIomlXzWx q9/Oqy2jyO8eO84ReUp8Oi3WPPK71G6IQOzaMuhulBhZlsYB6JLpHg7nuDAMf+Tz7aYE bKQ7ttcpkgl/xu27vGn80oIklRo3UVW885YEnXalIG/kADH9AiemTtfC69+SqKhquTaO ePJA== 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 o6si2325440edi.480.2021.04.21.05.32.28; Wed, 21 Apr 2021 05:32:28 -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 5ED3E6899EF; Wed, 21 Apr 2021 15:32:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe03-3.mx.upcmail.net (vie01a-dmta-pe03-3.mx.upcmail.net [62.179.121.162]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B71F6806EF for ; Wed, 21 Apr 2021 15:32:19 +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 1lZC1j-00FmkX-0D for ffmpeg-devel@ffmpeg.org; Wed, 21 Apr 2021 14:32:19 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZC0klBSK1ljeHZC0klEVVh; Wed, 21 Apr 2021 14:31: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=GCBw80C1ibin8SQsnoMA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 21 Apr 2021 14:31:18 +0200 Message-Id: <20210421123118.17901-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210421123118.17901-1-michael@niedermayer.cc> References: <20210421123118.17901-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfF9ngMxNQDe2QCw9a7Go+8aM3xu8blMIUU5pvnska1V92T+qiww0FdV9EpEqJmwsjirrIksiBY6DoaKBe7K2/0aIqUdfTCElKlnzDRvuovBl80+708pK fyU1bFQAp0mCMfWza1kGYmHdIg+dsoNJeeTJupGZiFNjbmnxY4dLxZez Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/exr: x/ymax cannot be INT_MAX 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: wwigvwHrW+uI The code uses x/ymax + 1 so the maximum is INT_MAX-1 Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 33158/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5545462457303040 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/exr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/exr.c b/libavcodec/exr.c index 49c4774145..59403fd1f5 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1795,6 +1795,7 @@ static int decode_header(EXRContext *s, AVFrame *frame) ymax = bytestream2_get_le32(gb); if (xmin > xmax || ymin > ymax || + ymax == INT_MAX || xmax == INT_MAX || (unsigned)xmax - xmin >= INT_MAX || (unsigned)ymax - ymin >= INT_MAX) { ret = AVERROR_INVALIDDATA;