From patchwork Sun Mar 20 23:30:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34872 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1218690nkc; Sun, 20 Mar 2022 16:31:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzYPvNOWGscgCJEv56tSkMfqeNPtkGhZ9+PED6e4YU2hDrWIihg+Cw9G5OKjiaA5p+w7t+M X-Received: by 2002:a17:906:c344:b0:6b4:c768:4a9a with SMTP id ci4-20020a170906c34400b006b4c7684a9amr18597791ejb.151.1647819088559; Sun, 20 Mar 2022 16:31:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647819088; cv=none; d=google.com; s=arc-20160816; b=RuVDwmrVpO6gCFfgjRVnd0KRVkqGBlhPCXQ04kbxfQTnh/BgzBr8eSb2bn20dbQujs 6FiuahyRRymMvFTTFMyhvYTOXNIW4rHj2iBGc6gd7T9J8/N63Vf9IMIFAgDJtp69BpLb KnP3pAggEnonPD8MSOsPFCKSUlXlVfJAnLMyCU5DRhsMRBJ+G8sjVmClgLSjziMcOV3w 2o4QE657Bqzyj4pR1g8ZyUoz/BdaTQX1OVdv/FsY+HSEXK8HoTXmkWV5ruhq6RNyd0BX LIsT996K8TaYnBWJkNsOndOZzMHn0eXA7mU9VtJ7ZYpMf6z9IbnQBOMvjs02EWFMo7AC PF+g== 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=+0vRS7/3BH5TvnGNkyXdU94sh+SpN1DTVkbncxQVbgQ=; b=hEh52RM1dbqi7qHVqQ+xwcYs3sb0x0P+Xr10i4hewbZi/BZyoAPp5RaDXgu0QE4o0L wTmhraojdjzFqN9Sl+id2Qcu81A8VWm5xxKb9XB4po2/KEjDMXYVIMWIVdFk2AvoXE9i yrDz0qxFxkppGPSnBL9DqXFbOkpOaGAPZvkDrwbbU3QXi2rbnmNcNx885w+cLL/CVjzt cLI+6fIqLYmtZo5w/cd5+ajxKLD3QnhYhyG5vnM3x9cTGzPkdRg6uYMhYxx/adrtyOmT NzshbmxRoqYCZHZuEF+KSqH1jrdBNP+I/pXuh2GTjBIV6S7PrmXa4ptFxTPA/uvk2y9R flPg== 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 b18-20020a50ccd2000000b00418c2b5bf94si8313119edj.630.2022.03.20.16.31.28; Sun, 20 Mar 2022 16:31: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 3BF9F68B193; Mon, 21 Mar 2022 01:31:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-3.mx.upcmail.net (vie01a-dmta-at03-3.mx.upcmail.net [62.179.121.153]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3FEAE68B11B for ; Mon, 21 Mar 2022 01:31:12 +0200 (EET) 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 1nW50x-00091V-DB for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 00:31:11 +0100 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W50xnGLiDSgGFW50xnIvZ0; Mon, 21 Mar 2022 00:31:11 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id W50inPQX4OPqFW50inIvAr; Mon, 21 Mar 2022 00:30:56 +0100 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=OcX7sjfY c=1 sm=1 tr=0 ts=6237b93e a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=NEAV23lmAAAA:8 a=5lYka-Aup5kaivsopTAA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 00:30:52 +0100 Message-Id: <20220320233056.18169-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfFmN5NFcFlNOVI/iafCepqzTo732y/7H578Iy7ouBAg35DOGU9O3DCW36lvEZE+V/Wx3/PUeGe9AvSeOAT1/RstlNmO4GqyY1PfhWeOpv6N1YejkAlDF rWbwET7B3775nMC3WH8oA5SCT9GEQ9mNJDUk0MbwGMyBUDzf+cgx9+31JMjNuJHnpQ4TMLVqFHuVQA== Subject: [FFmpeg-devel] [PATCH 1/5] avformat/hls: Check target_duration 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: rxEis/7E695p Fixes: signed integer overflow: 77777777777777 * 1000000 cannot be represented in type 'long long' Fixes: 45545/clusterfuzz-testcase-minimized-ffmpeg_dem_HLS_fuzzer-6438101247983616 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/hls.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index cf6ef9dfb6..a58c558ffe 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -819,10 +819,16 @@ static int parse_playlist(HLSContext *c, const char *url, &info); new_rendition(c, &info, url); } else if (av_strstart(line, "#EXT-X-TARGETDURATION:", &ptr)) { + int64_t t; ret = ensure_playlist(c, &pls, url); if (ret < 0) goto fail; - pls->target_duration = strtoll(ptr, NULL, 10) * AV_TIME_BASE; + t = strtoll(ptr, NULL, 10); + if (t < 0 || t >= INT64_MAX / AV_TIME_BASE) { + ret = AVERROR_INVALIDDATA; + goto fail; + } + pls->target_duration = t * AV_TIME_BASE; } else if (av_strstart(line, "#EXT-X-MEDIA-SEQUENCE:", &ptr)) { uint64_t seq_no; ret = ensure_playlist(c, &pls, url);