From patchwork Sat Sep 17 21:15:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37991 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp389446pzh; Sat, 17 Sep 2022 14:16:47 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6bz/LofMRrFtaNOq088DcTnLCKnBXL6DfmzC8xcD6JADarlsIaQtoh76V+eK+jEvdbzeKO X-Received: by 2002:a17:907:7e94:b0:77a:c48b:c80 with SMTP id qb20-20020a1709077e9400b0077ac48b0c80mr7373609ejc.690.1663449407131; Sat, 17 Sep 2022 14:16:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663449407; cv=none; d=google.com; s=arc-20160816; b=CLp/cnuVaUrIHX9vDFBT/I6a83GtBSS1i+HIfHmKbV+lspVuXVbbC6yds2SoVDM3gY Ztv6ONE5RGNa4hL9CeI7kCniMvyfgR/i/Le+Icb9KTJYYqOJrEGzKOC+WkBOhneDkxlA C//R4NMP7rUXck7WvK3MMcQU0lcqkvaqExNTFpxUbWxToACDneVxJuttE+Ms1NS2xpdh 6a//UPCoqShM2jXzwQ6IpgEV9/MC7DR7wHtRiD0+QTCLdPyF6I/xP2I5HXgY0fjuMZDP g2A86C8GKvwGoDtN/A4PJd8O8Ed58VG6IMYKSIlLsCkmC9UxMR1iEep/bqohCVKX8Rqh VQ+Q== 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=/oKhVWQxu1QuCOfm8cxMBpGEmdFJ2M5wZIgllaxCcXU=; b=NQFng1A6GC0o0AMb9IlIg8ZUV8rSMimyOm6GRKdX62zhnYGR7W97iaAZerNs8Wk5tb uDsu2doJJ25C9zqXA5hHe7J3fAMLsq30RHwCGEkUKZv6oMtjK29QnJ37A4ySyKw6Rec1 XjiIdWNp5k3gRQZE+Pjn+kaWlpe9Fsy9WK3p24DVLpC6MuYrXR7pUPUqiecNohKKaz3E G5ZEMve59Xv3j/OECRfbF0uscQL7LBNDY1AkGj1HDhfN94t4Zsw21w2zRf2qVJxvj5Ap qnaYVY9gUy33glH0z5XiZlOKuIfWQ30HUU/7LoVLgxq8rVtr7+e3RmhUj7oh5ESSswcQ vxoA== 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 rp9-20020a170906d96900b00730babc11e3si16546665ejb.640.2022.09.17.14.16.46; Sat, 17 Sep 2022 14:16:47 -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 2D6BB68BBC6; Sun, 18 Sep 2022 00:16:11 +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 48FF468BA85 for ; Sun, 18 Sep 2022 00:16:00 +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 1oZfAN-00DrNV-R9 for ffmpeg-devel@ffmpeg.org; Sat, 17 Sep 2022 23:15:59 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZfAMoPQUB8s8UZfANoEt8H; Sat, 17 Sep 2022 23:15:59 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id ZfANoy3fGbZLDZfANoILBb; Sat, 17 Sep 2022 23:15:59 +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=Ufwy9IeN c=1 sm=1 tr=0 ts=6326390f a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=JJivkjlbSVwfRkSe34sA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Sep 2022 23:15:54 +0200 Message-Id: <20220917211557.11547-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220917211557.11547-1-michael@niedermayer.cc> References: <20220917211557.11547-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKq4dzuArM76/NQYEO8esUrYd/wGR+o9H8JdspmBJiwZ/HNIHdoZoOQSAS1nZKd+h80BO8gdwGZHODuVtRQFAsm9g6cq+cIEEhGC8pPbThrywiQapkfX yVs2opJftzUeWjVoArRQaM3+Z4p/1LPCNOzHTxhrhT2zXoNe2p1QCHtOtTAKaBj5pvMXrfqOXPe7Ag== Subject: [FFmpeg-devel] [PATCH 6/9] avformat/dxa: avoid bpc overflows 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: dBmb/eet6/3f Fixes: signed integer overflow: 2147483647 + 32 cannot be represented in type 'int' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-6639823726706688 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/dxa.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/dxa.c b/libavformat/dxa.c index 16fbb081568..474b85270ae 100644 --- a/libavformat/dxa.c +++ b/libavformat/dxa.c @@ -118,9 +118,12 @@ static int dxa_read_header(AVFormatContext *s) if(tag == MKTAG('d', 'a', 't', 'a')) break; avio_skip(pb, fsize); } - c->bpc = (fsize + c->frames - 1) / c->frames; - if(ast->codecpar->block_align) + c->bpc = (fsize + (int64_t)c->frames - 1) / c->frames; + if(ast->codecpar->block_align) { + if (c->bpc > INT_MAX - ast->codecpar->block_align + 1) + return AVERROR_INVALIDDATA; c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / ast->codecpar->block_align) * ast->codecpar->block_align; + } c->bytes_left = fsize; c->wavpos = avio_tell(pb); avio_seek(pb, c->vidpos, SEEK_SET);