From patchwork Fri Apr 23 17:50:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27225 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1749786iob; Fri, 23 Apr 2021 10:52:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwRc/e4m9n25tJrqejj/jk3kFEeplXAmu0U0BsqbvbpzNvZ96y4kfOcYaELiuxO7P33kQFt X-Received: by 2002:a05:6402:27d3:: with SMTP id c19mr5965415ede.129.1619200343181; Fri, 23 Apr 2021 10:52:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619200343; cv=none; d=google.com; s=arc-20160816; b=IEwh2gFR30QOdVJ0qSx1PRmQQ/wFCx8MyV65yG9EljpLUTQNbOhmsAInmbdhhZmKO7 uz+VSBganLIm4IU3zgTBszRO1Mc0cS9iDGRsBHZCO2io+1CB6Iz0gyfGzFuif/hRu9O0 Eb06aKQpFODeKvpo3LuBRb3i9Kk1BBdUbPCj3vvshMw9LKmbifwO3gpchac0yBRrIwDt KkwHUARsNEMLnN6/u2BLf+T5t2O8nNnGZxUiYKvvTILKj5MSmWA4ypS2k7HHW1fHvlMN qR38t0vxN0aGqPLOz5ZgqwNAHZUbxgPp04FwDBS8bvOoakavT5FtY/q4E/CzxBG8gOF4 NUHw== 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=GHD5cQXYZQrnFjC7p5umXycfbDTVIYrYtI14+zbC5/A=; b=CFVfJLMsUCPOR47a2gqGG5G7TOlH3+Hk2pvC+EeykKw7MJ03FZu+C9yypJUgCjBXUO 0dfaZpxcsDg1dUoD4crVNL0p4Bmiu2cccZdIDf+PTUkeR40xk0iIhS6QIHWX6SEMSbze D3J0AivfA9ANLBvey1S1RWBeHRckNLhfR4UvsteBwkYB0/M2yUd0+TRkVWgAyE1iiJt2 ZLUSpXrfRu4zyfYxvvV1ufg82BEkVbTZAcn1Sem4VNaJkkQPnV7B594I9SR8qmBeu1w+ h9AcWrc0o51bXXCFd8q/28ZB+gJlALW7QQqyvlvZNiQE+amh25kjLxPcxZB+iJqEc+LC fSPQ== 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 p26si5729221ejz.239.2021.04.23.10.52.22; Fri, 23 Apr 2021 10:52:23 -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 4336B680107; Fri, 23 Apr 2021 20:52:05 +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 C190F68987B for ; Fri, 23 Apr 2021 20:51:57 +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 1lZzy9-00336w-0I for ffmpeg-devel@ffmpeg.org; Fri, 23 Apr 2021 19:51:57 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZzxAlGeY1ljeHZzxAlb2ne; Fri, 23 Apr 2021 19:50:57 +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=W-GeKqF9Rv45Jb_JCTsA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Apr 2021 19:50:50 +0200 Message-Id: <20210423175056.24019-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfKPM2k8SHcfE0jCKoBXOCwCY6kBDQ7MZRVMFl7KnG8xwlNW6ve546x6zkU8nbidRcnd4w+Vx7ZQjGv68H+PxwsDfyTdnhcwgQmCYGQ4Avp07A5u0M6p8 GZLuyKjGqdngI8hkCMU3T1kGzhK7BI0bQi8qL/ZXGIVr6jJgbexNH5Iw Subject: [FFmpeg-devel] [PATCH 1/7] avformat/asfdec_o: shrink extradata to the initialized 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: ewTXi3MDqp9X Fixes: OOM Fixes: 27240/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_O_fuzzer-5937469859823616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/asfdec_o.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 6cfcd8b088..d08a09c14d 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -600,8 +600,12 @@ static int parse_video_info(AVIOContext *pb, AVStream *st) memset(st->codecpar->extradata + st->codecpar->extradata_size , 0, AV_INPUT_BUFFER_PADDING_SIZE); if ((ret = avio_read(pb, st->codecpar->extradata, - st->codecpar->extradata_size)) < 0) + st->codecpar->extradata_size)) < 0) { + st->codecpar->extradata_size = 0; + av_freep(&st->codecpar->extradata); return ret; + } + st->codecpar->extradata_size = ret; } return 0; } From patchwork Fri Apr 23 17:50:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27223 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1749679iob; Fri, 23 Apr 2021 10:52:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQcU2WU6doBKXW4sAB5NAV2Wd7N8iY+3jsspcv55q1rwrwXt565hYR7vxxLmZrK6+S+Tc+ X-Received: by 2002:a17:906:af5a:: with SMTP id ly26mr5385743ejb.372.1619200329851; Fri, 23 Apr 2021 10:52:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619200329; cv=none; d=google.com; s=arc-20160816; b=xqpnEQg5SD36b9hO+201GeD41thDI2zC/PzIghmP+dREjU88svtENR4KgEN6KnC6+Q lXgQtWPx2Goa/aKwGskrkZHMlzkQqgoGWvq0h/XCdjLdMPRJyYu1Pgko4ibmML/gzR5H oAydHGJl6Klnz9KOWa87C6kZu51r70jVj18H4PsFSGCHi762QyF+H2GmsX64dWoenElu /DrzhoIXFDSwpCwdYyBXIyDqCyPf3IaXi6ozNWwkqI8jxPfRXa73xxFRWRlwvL1clkX+ RZy3Pwn9urHHMAhG8k//WMNXea9Ec+Abypbct1AViu+icj61b/K+Lih/B93O6ZVDNSzz 4EPw== 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=Vo9KFKOQ+F4O/rj+9naIaK0BplKX9QZBt3zTR7SwVSw=; b=G07tgSn+T7p0P0K4+tZju0Hsbh1OTLTQQRKPBoa09M7cJf/yoJyeP63lm1iSBimd7P kkWRY3Lr9hEsHzAYIYRHb1M4/Nf5c+E5djJbDuarxBowaNVgn28Qs4scbEqF5ZWFIdoP ezP1lNeHZuyIrKLZRFimYa1I6wLcbHGBcNjo1SOdXUg1WH8nkY12NI60imMAr/PFpMhe 12KKHnXPm2a8cIsgCKrkh+wRG37etQpN60LpqHdv8gp3Vid5Ht4VfC/A64sAqN85VaBO 5S7+UdZAFSX75cgtmOyJB3h8oaVV7lrjNH1GyqUPdOZlZQfIEmyACMvwKKA8IZyEszBT 4ZyQ== 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 p23si6577798ejg.550.2021.04.23.10.52.08; Fri, 23 Apr 2021 10:52:09 -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 03EF4689CA7; Fri, 23 Apr 2021 20:52:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BE5D7688124 for ; Fri, 23 Apr 2021 20:51:57 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lZzy9-0009Ui-0F for ffmpeg-devel@ffmpeg.org; Fri, 23 Apr 2021 19:51:57 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZzxBlGeYsljeHZzxBlb2o9; Fri, 23 Apr 2021 19:50:57 +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=T98hxhEdsUayia65omUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Apr 2021 19:50:51 +0200 Message-Id: <20210423175056.24019-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210423175056.24019-1-michael@niedermayer.cc> References: <20210423175056.24019-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKPM2k8SHcfE0jCKoBXOCwCY6kBDQ7MZRVMFl7KnG8xwlNW6ve546x6zkU8nbidRcnd4w+Vx7ZQjGv68H+PxwsDfyTdnhcwgQmCYGQ4Avp07A5u0M6p8 GZLuyKjGqdngI8hkCMU3T1kGzhK7BI0bQi8qL/ZXGIVr6jJgbexNH5Iw Subject: [FFmpeg-devel] [PATCH 2/7] avformat/aiffdec: Check for size overflow in header parsing 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: 22fqC11SMM7L Fixes: signed integer overflow: 2147483647 + 1 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-6723467048255488 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/aiffdec.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 1b693b71a3..7ec408b2e6 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -100,6 +100,9 @@ static int get_aiff_header(AVFormatContext *s, int size, int sample_rate; unsigned int num_frames; + if (size == INT_MAX) + return AVERROR_INVALIDDATA; + if (size & 1) size++; par->codec_type = AVMEDIA_TYPE_AUDIO; From patchwork Fri Apr 23 17:50:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27221 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1749885iob; Fri, 23 Apr 2021 10:52:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGeum9ECCsA1dDgtCEDE+50FUqyJPi2+/gapv6jLZjMNc4jsP4+7U2mm6TV70MZDERH87M X-Received: by 2002:a17:906:6bcb:: with SMTP id t11mr5476965ejs.395.1619200352799; Fri, 23 Apr 2021 10:52:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619200352; cv=none; d=google.com; s=arc-20160816; b=vAJTk/Wkfzju1+wiEyjT2Abbnpc1WdpYvfhV/Zb/FxnSMnk4erjooanmrxMzlTNwyu yJwp2uM4ivdLAnvS/kgsjsqU//6WsKRdly5iuYYHzpLunRvvndzDkiJ55KRsCrDRI5yX +0ONt+HxytNpXrRFwfn1TlbgJepb4ELMYAGTTV9gEiQ+6gYXWJU7wyyVBRqrSVUXV0W1 FfJhOA4WGH6Sg5gtJVm94ByH6673nmCS1Df72rSHJNmNL5KPH0LB7d0Aqf7YBZLUICP9 Hl45/4rjox6Qr3jl4PI1us5CQr/zJPBWH1Ow421DvshhvrQb5jGMqsDBFT8mCqGpqroj CRXQ== 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=9xPgdNfYt2nheuJvycJBngOCfGaHbafeWbi43klDeb8=; b=mgOoq70H3HoGmCN0l/xpTXhrR3fTF1/TV3p97n4fF3kRmyvsrGVZLGA/DWlshIxM2O qNF4NbiBvjQyXgoUmSNRFVSBq6tfmzRVGSqRqV6r432kc1XCiIisUltStOORyhjET/bn BJXbCczYnDWjqq3O4RxKAWNrmeW86FjFhOcg2dspHklZgOXhcLZDMU9wae7TmC02BYuI GBOD6RF6PS0w/QYdZXdPmno30Ucpseyq6bpGZtZPAmJXZ59TZKwi5NF9Q6qunahENhNE mIX7HQvjn4TqVSi2iLDx8LnAMdJkAGUtwBwx4IXsXmQV19H6pHD0VSuITcbTkFmJkPUg 4iWw== 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 z2si5836826ejx.497.2021.04.23.10.52.32; Fri, 23 Apr 2021 10:52:32 -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 38D1A689DC4; Fri, 23 Apr 2021 20:52:06 +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 C253D6898E3 for ; Fri, 23 Apr 2021 20:51:57 +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 1lZzy9-00336y-0I for ffmpeg-devel@ffmpeg.org; Fri, 23 Apr 2021 19:51:57 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZzxBlGeZ4ljeHZzxBlb2oQ; Fri, 23 Apr 2021 19:50:57 +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=UlA4yjZwH3SWBeAk2-EA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Apr 2021 19:50:52 +0200 Message-Id: <20210423175056.24019-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210423175056.24019-1-michael@niedermayer.cc> References: <20210423175056.24019-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKPM2k8SHcfE0jCKoBXOCwCY6kBDQ7MZRVMFl7KnG8xwlNW6ve546x6zkU8nbidRcnd4w+Vx7ZQjGv68H+PxwsDfyTdnhcwgQmCYGQ4Avp07A5u0M6p8 GZLuyKjGqdngI8hkCMU3T1kGzhK7BI0bQi8qL/ZXGIVr6jJgbexNH5Iw Subject: [FFmpeg-devel] [PATCH 3/7] avformat/asfdec_f: Check sizeX against padding 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: BhURwJxCN8x8 Fixes: signed integer overflow: 2147483607 + 64 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_fuzzer-6753897878257664 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/asfdec_f.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/asfdec_f.c b/libavformat/asfdec_f.c index 27162e9559..18d637b1a4 100644 --- a/libavformat/asfdec_f.c +++ b/libavformat/asfdec_f.c @@ -415,7 +415,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) tag1 = avio_rl32(pb); avio_skip(pb, 20); if (sizeX > 40) { - if (size < sizeX - 40) + if (size < sizeX - 40 || sizeX - 40 > INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE) return AVERROR_INVALIDDATA; st->codecpar->extradata_size = ffio_limit(pb, sizeX - 40); st->codecpar->extradata = av_mallocz(st->codecpar->extradata_size + From patchwork Fri Apr 23 17:50:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27226 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1753691iob; Fri, 23 Apr 2021 10:57:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtsoTB6PDNaSLrXPeiN21vdOqgvE31+OfrpJbKI77zlSdoj8xOcsRcVm3TkH6SQ4ndlaPl X-Received: by 2002:aa7:cd51:: with SMTP id v17mr5915788edw.137.1619200662780; Fri, 23 Apr 2021 10:57:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619200662; cv=none; d=google.com; s=arc-20160816; b=QfvvxU4jLf6CJHyU3C1kdjSFhMUoKwBgYQU5A9SlgB5hEPTeiHNLMaqH7+sM1W/kFu /JT+kRewNb4AawDgVLsnBjniZYnIKhGjD9SAcstYt457xLXz66igZ6Wl7rvsNldvjO/v ezYTtf7Qlbm9lKbgIaffAHHY4+GBfINJu9YygSvGzUycyqzN9TPrvP26aGSpUY+dij2c VHC07PCGR9Qvw2UqUZLhAHvvbBe1nDYHfRLAhlSBpR4FjO9LAuMyqoMILDrZKsilSLAi F7XlKHA01/e9CRWDj8NoOa+Dzw1bwond7o3vxXebvczGIsi8TsqNbCVx4rHuV8WAVje4 qLRg== 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=1JFbaX96dOYVtmkHEalSTQPRz7k/th5Wad8LHe6MiE8=; b=EjpD1U20j/yFg12ewh1bpeTlX60jxUtQ3QpUgGSCeHIspx6MIsYuuU1fQ1Jzs7UXvH hfTXOSnqpGO3KmRDioLAXmk9A1S0B0t6qWtv2WmaZiLzQpU7ctHJ9fZFesXOs0Mm60fx nlVRGl5fT7LUXBwmVw/IJnW0u4weSoKBCwI7yjV9YnPs/3hVk5uWsZ9JrviC9fywk4QT HuYYHJdKHpQaswAk+na8dDVsskUGqU0543RaBh7hmpe7H75q+MHoBdv4c5cOXT6MTH67 INHLDJYdj9KutCAjpla2BxmMdadYy6jZ9KygEGavdIDIHEWzqy+JmLpmchIabih4qUgS kt1w== 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 f15si6441309edm.87.2021.04.23.10.57.42; Fri, 23 Apr 2021 10:57:42 -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 B8779689A61; Fri, 23 Apr 2021 20:57:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C1246809C3 for ; Fri, 23 Apr 2021 20:57:33 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lZzy9-00CtFT-0Q for ffmpeg-devel@ffmpeg.org; Fri, 23 Apr 2021 19:51:57 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZzxBlGeZVljeHZzxBlb2oV; Fri, 23 Apr 2021 19:50:57 +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=XE_MPITcmiV4qhIzx7YA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Apr 2021 19:50:53 +0200 Message-Id: <20210423175056.24019-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210423175056.24019-1-michael@niedermayer.cc> References: <20210423175056.24019-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKPM2k8SHcfE0jCKoBXOCwCY6kBDQ7MZRVMFl7KnG8xwlNW6ve546x6zkU8nbidRcnd4w+Vx7ZQjGv68H+PxwsDfyTdnhcwgQmCYGQ4Avp07A5u0M6p8 GZLuyKjGqdngI8hkCMU3T1kGzhK7BI0bQi8qL/ZXGIVr6jJgbexNH5Iw Subject: [FFmpeg-devel] [PATCH 4/7] avformat/avidec: fix position overflow in avi_load_index() 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: t5fKeNCX00vR Fixes: signed integer overflow: 9223372033098784808 + 4294967072 cannot be represented in type 'long' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_AVI_fuzzer-6732488912273408 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/avidec.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 48370fe5ce..4ab4d92f92 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -1783,7 +1783,10 @@ static int avi_load_index(AVFormatContext *s) size = avio_rl32(pb); if (avio_feof(pb)) break; - next = avio_tell(pb) + size + (size & 1); + next = avio_tell(pb); + if (next < 0 || next > INT64_MAX - size - (size & 1)) + break; + next += size + (size & 1LL); if (tag == MKTAG('i', 'd', 'x', '1') && avi_read_idx1(s, size) >= 0) { From patchwork Fri Apr 23 17:50:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1753777iob; Fri, 23 Apr 2021 10:57:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrClyfGXumC+MEz9fmqQqaHY87RmCqI3y3ERSZMZltTwprsY2Wvb9CDpFfOX1HrVUppJa1 X-Received: by 2002:a17:906:2546:: with SMTP id j6mr5487776ejb.51.1619200672585; Fri, 23 Apr 2021 10:57:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619200672; cv=none; d=google.com; s=arc-20160816; b=ItDW6ZltXAQ6TctvvZXdgXaysO5RIZoAiq/In5woThhfs86/Rc9Ea+sliCO0EOiLML JbljDlzcwuJkj5tFsO8NTK9qu/MBjSRH9mAgohuEG/PMG0Q0xjoJxO+dsLRfaIJXXtCO hLiJj9tP1KX4Sk+BKsu3LdFNbonig4xPcYAmdVJwVcO1X4/yYT+YPmjrRYlWhnhzXOBi wSKuMxOm3BpU4z783gqxiHGEsCbMIz17PDbfUqON4BY8LsjEOlTzgquEu8Evt+za0oyQ +C2EUrdPDKaqQxU9k2xe6f5IUM6NLhSr2dOcW7WPpYhvFs5h/6G9086yYWW8aHxyzh3P hSsQ== 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=ok1Ye/evwe0JVRt8O2kc4u5J0bYxsbI10+peZUUNwP8=; b=aUj5+wX2hMqMwn4W2y+tOu55iR+B7bF1F6UQrcpLWNrElKXM5HkfPr9Nh6b2gP9PTU Cn06evC3+4MjcSUdpHL1MXa3gcbtbRp3jA2O4yYkJXsJEjPB6hiCG9S/tqX5RcF7s764 6DUfK3++hdIly0mMoX05CWaueH1xaDQoR8rdWhY0QLxejs1+TE7Dl3Pd9sMl87HIqm/o 7lOJh2jmZ9dbG0l6laNmTBuVEOlCv+vWHJdvenjdpdPjwdssGWX1dbg6TJz8A1MNsVcm 3iX3QeRjvQ+TkB4k5bRXIE8NVL5+BSv82VQUfFC0aB6KjXesrUjp3h98Ozl6ZBlTpASp CvQw== 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 r10si5532959ejx.498.2021.04.23.10.57.52; Fri, 23 Apr 2021 10:57:52 -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 C43D1689EA6; Fri, 23 Apr 2021 20:57:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 78790689D6C for ; Fri, 23 Apr 2021 20:57:43 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lZzy9-00CtCV-0Q for ffmpeg-devel@ffmpeg.org; Fri, 23 Apr 2021 19:51:57 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZzxBlGeZgljeHZzxBlb2oc; Fri, 23 Apr 2021 19:50:57 +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=ONHqJ30sOa6sBXoNoAwA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=SsAZrZ5W_gNWK9tOzrEV:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Apr 2021 19:50:54 +0200 Message-Id: <20210423175056.24019-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210423175056.24019-1-michael@niedermayer.cc> References: <20210423175056.24019-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKPM2k8SHcfE0jCKoBXOCwCY6kBDQ7MZRVMFl7KnG8xwlNW6ve546x6zkU8nbidRcnd4w+Vx7ZQjGv68H+PxwsDfyTdnhcwgQmCYGQ4Avp07A5u0M6p8 GZLuyKjGqdngI8hkCMU3T1kGzhK7BI0bQi8qL/ZXGIVr6jJgbexNH5Iw Subject: [FFmpeg-devel] [PATCH 5/7] avformat/bfi: check nframes 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: T2vCimnP1+Gj Fixes: signed integer overflow: -2147483648 - 1 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_BFI_fuzzer-6737028768202752 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/bfi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/bfi.c b/libavformat/bfi.c index 2dab986f3a..f9e0bb2e30 100644 --- a/libavformat/bfi.c +++ b/libavformat/bfi.c @@ -73,6 +73,8 @@ static int bfi_read_header(AVFormatContext * s) return AVERROR_INVALIDDATA; bfi->nframes = avio_rl32(pb); + if (bfi->nframes < 0) + return AVERROR_INVALIDDATA; avio_rl32(pb); avio_rl32(pb); avio_rl32(pb); From patchwork Fri Apr 23 17:50:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27224 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1753871iob; Fri, 23 Apr 2021 10:58:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxaGdEw/GLXI+R8BVauznp3QPOx0Zxt97LvuqrJwopyiOzZkvwFxl8Sl0mcMZmI7VOINDlx X-Received: by 2002:a17:906:93f7:: with SMTP id yl23mr4507559ejb.407.1619200680266; Fri, 23 Apr 2021 10:58:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619200680; cv=none; d=google.com; s=arc-20160816; b=msIgEI8Q3XZd5YGV3yON0hdLk7fDfy+/tH0ShIei8S4tFzavr2wvUjL2HY4KPo5z1R DCqOUjL8oMOY+EPx1MrJ+a/7J7TSu8cR7Qbz19hCAI/C9UpFxIJYYssABG3+79SyzP0E VdWjIalgy5yfaX/Mnsj1XtfW9NMyWsHYmjbMOdukHjSSGMqdUX1xUGiD/hMNba+pqlNt ZlQffaesPPBrVZcBdF3554XxpoSA27mlnUs6SiUv03rL0U7AetJQeJw+IJSFGEnMXKss 8wj2LZZfV/TYylmuR3ymHzIlyCQtOWZnjFGSfMacVztaHP6FjtkenJ4+rD1YbLYP+Et/ k9yg== 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=L1eX5Wz2+uxGnV/II9FXd9/Ra9wl4Z/rZl2DLuVT3RE=; b=YN9Unlb/QXlUN/Oma6n5d+DeyTRpdZiX+3fpQeHJVYCKUBMlPqCCOMxJ0zv0YZIkzD aYEe5Y/2QIVmHCnvzZ6fh6NJ3XM4vY2APulbCKQ1fhEfEpGv+yW0vL0Ym80LYeox8Ql4 ZYyANJ3M1WdE52s/gZfBI6XzfnJrQjHBEd6Nauu1QRo50iDs4OD1obGQTBPrcPap37hT RXGRR0N5QPMjDbcisWTFHsWd38iwA5bHsOqWFqDgKWVMqYyHt+B0QQmEaiu/m9a+XGTa OLHyeNilp7HerO1qF2Q7hboih3yGuq9UqMlno2W8+ZN8tVjr1uiYm0KneLxGVIND8Ahr s1tw== 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 j12si5408143edq.408.2021.04.23.10.57.59; Fri, 23 Apr 2021 10:58:00 -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 CEE72689EB2; Fri, 23 Apr 2021 20:57:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-3.mx.upcmail.net (vie01a-dmta-pe01-3.mx.upcmail.net [62.179.121.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 410D268987B for ; Fri, 23 Apr 2021 20:57:49 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lZzyA-00CtFT-0M for ffmpeg-devel@ffmpeg.org; Fri, 23 Apr 2021 19:51:58 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZzxClGeZvljeHZzxClb2oj; Fri, 23 Apr 2021 19:50:58 +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=BgjjGP0nQ8SBBV0uqHUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Apr 2021 19:50:55 +0200 Message-Id: <20210423175056.24019-6-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210423175056.24019-1-michael@niedermayer.cc> References: <20210423175056.24019-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKykrPkteO1WGO8ux/Y/fLKqxsVEQjPhIbNsh1nScj2u8QiG1uV9DPBn8dPwQQR+c8xEnFOro6O4Z84EXDjt8rZaSkDvNG7UzKDWTGyuIMNOgJvpck8b 90OMilX+KzkpBiUlt1WRU5BYQq9mHifiWWDm8XVduO9GdPcfEUiAAFTL Subject: [FFmpeg-devel] [PATCH 6/7] avformat/dsfdec: Change order of operations in bitrate computation 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: XjwnbguUjjZu Fixes: signed integer overflow: 538976288 * 67372036 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_DSF_fuzzer-6751696819716096 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/dsfdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dsfdec.c b/libavformat/dsfdec.c index 2fca25ef32..7681c917c5 100644 --- a/libavformat/dsfdec.c +++ b/libavformat/dsfdec.c @@ -129,7 +129,7 @@ static int dsf_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } st->codecpar->block_align *= st->codecpar->channels; - st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * 8LL; + st->codecpar->bit_rate = st->codecpar->channels * 8LL * st->codecpar->sample_rate; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); avio_skip(pb, 4); From patchwork Fri Apr 23 17:50:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 27222 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:5014:0:0:0:0:0 with SMTP id e20csp1749960iob; Fri, 23 Apr 2021 10:52:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCZ60CpVF4/qJzDQB0Pqealew1gbnXIjFBC4e5RuZcyeGpk+CN3FmnBHWhQAvtYYW/ZDVW X-Received: by 2002:a05:6402:2215:: with SMTP id cq21mr5913707edb.177.1619200362015; Fri, 23 Apr 2021 10:52:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619200362; cv=none; d=google.com; s=arc-20160816; b=NGaSpb+mDSyR88K9ood1K/WiY2SboHrR47Eqf0OjHDuaEIt6gcBCGVhBDev4yd/5Te SK9QxDxeTjDasTqf9yhMnmV2p8+kTvusXWlVk8Rad5asjcADCvrIqpL33IdH6LC9xss/ NvFGqkGqTD4IUS4OUi8zFmIJSuiwQZhUs2GfoMz9FVNByOvGu1iMNrxIbPDST1IwK00h Xj4hRaIswS6inNo7q5dMPJaXUXg0gCBoyQwUnPKubp/v8Hvm6GygDU2aZtr+p0959CA1 YuFgcV86fcGlRCRJtAkYeMxYmv7f5iLOBTp821V+/Rowomt6gSU6PWYDwT5IcDFPovvm 7YnQ== 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=TsJ/t+lCw3fcTwSOPwvwB4HTwam8bmfv2Km5XKKaHdU=; b=NabIJHHIVJk1/i8DTfLPDp4bun18I4ffe4o0bCzf0f01g78qIF6T1V1vza9ENDhyay j+ZT9sNNqb59Zso0bNDGa5jkAuPvexDAl2IF+gGUxIe90jnav9vNcr4fEfetnse/ulNx y6eJC8Mk2qQJqN7F9eKudXuNBXVYuUKi2b9asnEMjICzsgwPK2ddcaih8WMlgyX5Ukhp SUMZP9X2GU/z1cUVGBdi7kK3Z70EM9uCiWmy6qEP8Rpe5/60X10SBoKWJ71HG0QFBmX6 jRRwCQqnYDdhjK/vord+qq3C9RsmnVbZ4wY4Ycbw+i00cHgOW4tkCFJfXoiV9uiD6dlY EmBw== 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 n8si5671401edi.381.2021.04.23.10.52.41; Fri, 23 Apr 2021 10:52:42 -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 47FE5689E50; Fri, 23 Apr 2021 20:52:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe06-2.mx.upcmail.net (vie01a-dmta-pe06-2.mx.upcmail.net [84.116.36.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 334DC688124 for ; Fri, 23 Apr 2021 20:51:58 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1lZzyA-0009WR-0B for ffmpeg-devel@ffmpeg.org; Fri, 23 Apr 2021 19:51:58 +0200 Received: from localhost ([213.47.68.29]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZzxClGea8ljeHZzxClb2on; Fri, 23 Apr 2021 19:50:58 +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=meFjb1dTpWCH-79zeJIA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=UDnyf2zBuKT2w-IlGP_r:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 23 Apr 2021 19:50:56 +0200 Message-Id: <20210423175056.24019-7-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210423175056.24019-1-michael@niedermayer.cc> References: <20210423175056.24019-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfKykrPkteO1WGO8ux/Y/fLKqxsVEQjPhIbNsh1nScj2u8QiG1uV9DPBn8dPwQQR+c8xEnFOro6O4Z84EXDjt8rZaSkDvNG7UzKDWTGyuIMNOgJvpck8b 90OMilX+KzkpBiUlt1WRU5BYQq9mHifiWWDm8XVduO9GdPcfEUiAAFTL Subject: [FFmpeg-devel] [PATCH 7/7] avformat/dsicin: Check packet size for overflow 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: mjXm27bgGxaz Fixes: signed integer overflow: 24672 + 2147483424 cannot be represented in type 'int' Fixes: 29102/clusterfuzz-testcase-minimized-ffmpeg_dem_DSICIN_fuzzer-6731325979623424 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/dsicin.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/dsicin.c b/libavformat/dsicin.c index b18f43b9a0..5a1f256595 100644 --- a/libavformat/dsicin.c +++ b/libavformat/dsicin.c @@ -166,7 +166,8 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt) CinDemuxContext *cin = s->priv_data; AVIOContext *pb = s->pb; CinFrameHeader *hdr = &cin->frame_header; - int rc, palette_type, pkt_size; + int rc, palette_type; + int64_t pkt_size; int ret; if (cin->audio_buffer_size == 0) { @@ -182,7 +183,9 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt) } /* palette and video packet */ - pkt_size = (palette_type + 3) * hdr->pal_colors_count + hdr->video_frame_size; + pkt_size = (palette_type + 3LL) * hdr->pal_colors_count + hdr->video_frame_size; + if (pkt_size + 4 > INT_MAX) + return AVERROR_INVALIDDATA; pkt_size = ffio_limit(pb, pkt_size);