From patchwork Thu Jun 16 23:15:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 36292 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1202223pzb; Thu, 16 Jun 2022 16:15:36 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tW7+QMqnGkLjpj/mNwQjTx9m1TgpfORsJP8Ias5OeKDpByRwy05be8QJi3DtD3HuBSt/JE X-Received: by 2002:a17:906:e2d2:b0:704:81fe:3152 with SMTP id gr18-20020a170906e2d200b0070481fe3152mr6498332ejb.411.1655421335911; Thu, 16 Jun 2022 16:15:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655421335; cv=none; d=google.com; s=arc-20160816; b=RuQxsfShKpzE+J0Pyc5Us1TKsB0EUmzG47eyytKe83/zQfCAWUNC2ak0shemZmzh9N 2atlu71jCuls+wuxyoDOYo0ogzW3tFlsUi7NXFe+BhAAmNJuAWGD2MHsUH2eZvIEoi8Z 3IhBA4ErN2f6vB0UQrhdZWLEG6Lio4wVvVEa9kaGMmksAqlgaq9Bw0PlhoeBnaA98ASJ QDAk2RvmfOXHZOzz8yIRpwgnuLOiEkBusVnfTyrCX5JthXNBHYFdzNy/Ek7exoAdXxIM jcqhwXusouVo9jTpRgGQEZM+n0srT5pDNwyC5nCKgcBx/1G0O0QAUKtH4kki3ZA9I0A+ CwbQ== 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=PFWXAjOSAYulKE0+u36djThLe4ZjuU/caoAv2VQEWKE=; b=mFLTD+J3EwPL+2vffYQ2No6PGoPA+CtRHnMceppMGV0LJyiBgEkbhziRYwVrwzkPR/ 7BvbNxL0sOdyigUu/qE/FPYgv6N8fxE08dnch/cWdCXnJ1apT3ok29M+epkcHGWjy/oy k/FtYBOvcvZPyGojk07Nw4ALWWGvivE7nMRyoludrr3a7bymdbpq7JiCn3vE1wKXnaly xW+E/wF0YJradPZTY4cjkL+mbrBL++ruQRNnYv4zccHqzUaGwVwNa5fdCAPpGgh+wEhI 4bORUraKXFDZZcOl7HOy5/BNwEjDWRk0DDjz/y8eKD5vQZBmJE/Oaor968BK7lhCkwq4 zD7w== 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 di9-20020a170906730900b006fea12b7544si3123154ejc.730.2022.06.16.16.15.34; Thu, 16 Jun 2022 16:15:35 -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 98BA968B87F; Fri, 17 Jun 2022 02:15:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-3.mx.upcmail.net (vie01a-dmta-at01-3.mx.upcmail.net [62.179.121.147]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD33868B86E for ; Fri, 17 Jun 2022 02:15:24 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1o1yhv-005Gd8-Qc for ffmpeg-devel@ffmpeg.org; Fri, 17 Jun 2022 01:15:23 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id 1yh8oUeq18s8U1yhvoSfuR; Fri, 17 Jun 2022 01:15:23 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id 1yhuoO1T3OPqF1yhuooX1Y; Fri, 17 Jun 2022 01:15:23 +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=OcX7sjfY c=1 sm=1 tr=0 ts=62abb98b a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=6Ss4WJ961IadZEohst0A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 17 Jun 2022 01:15:22 +0200 Message-Id: <20220616231522.19275-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfKzEU3qhaIJ/MTW2VueM2tZx17JozKsbbVrXSgXyhEwznOZcHpxkujm88rgQZjaTnLrWLKXEa4LKwMjxGZXbKg13DkpLIxqcuERlZmqBWZ1KSoe2LFUV ERYxNSuKnG5hVxhKt1NO5Uj9bdgHu2sSL72M8jKBhfGris5/GLCaoxZq9COXijgHx3PCUK4blr+lag== Subject: [FFmpeg-devel] [PATCH] avformat/hls: Limit start_seq_no to one bit less 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: Ceh97BHhzcoZ This avoids overflow checks on additions with 32bit numbers Fixes: signed integer overflow: 9223372036854775806 + 2 cannot be represented in type 'long' Fixes: 44012/clusterfuzz-testcase-minimized-ffmpeg_dem_HLS_fuzzer-4747770734444544 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/hls.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index 8204f55df3..b736f093a9 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -837,10 +837,10 @@ static int parse_playlist(HLSContext *c, const char *url, if (ret < 0) goto fail; seq_no = strtoull(ptr, NULL, 10); - if (seq_no > INT64_MAX) { + if (seq_no > INT64_MAX/2) { av_log(c->ctx, AV_LOG_DEBUG, "MEDIA-SEQUENCE higher than " - "INT64_MAX, mask out the highest bit\n"); - seq_no &= INT64_MAX; + "INT64_MAX/2, mask out the highest bit\n"); + seq_no &= INT64_MAX/2; } pls->start_seq_no = seq_no; } else if (av_strstart(line, "#EXT-X-PLAYLIST-TYPE:", &ptr)) {