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);