From patchwork Sat Sep 17 21:15:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37989 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp389360pzh; Sat, 17 Sep 2022 14:16:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4WLDQQ7CYVmOHqriS0FjM+xaem7sRyupSH9449sN8amnjvCTkYiLdetnyUP6xPRlqdbVty X-Received: by 2002:a05:6402:2711:b0:451:327a:365f with SMTP id y17-20020a056402271100b00451327a365fmr8931412edd.315.1663449390190; Sat, 17 Sep 2022 14:16:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663449390; cv=none; d=google.com; s=arc-20160816; b=iwiWoErCXNYYwtyTRQpFSUfUgjQQFoYL47jM4Al66plOtChW//6ruvF2sxuGXKtTlO wHUZ5Hkw2k14KyZ7WMz51jC+0dExf7eHVtqL6mWxZyCWEo/hEL/RfrCAVWpEBJQsWeld abj+gNPS/qWgu6mridFHcRBdVrDPh/5MaBrHGjxcZrtJcnXtkqqUT6KAsNCsWaOV5I74 lIdrOVlo2XsyYvRs+5fsqeuqA15ousDdCnSrkrMLJa/uFFKNASP9KY2crz+/PyAgSXRP 5PWRzfcHnm4CWvsQWEiBkqj4HKrd8NQ3ALbtnO++56V8DzIW4gYnDeJh3deYdiWqGQpx AbIg== 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=+MQe5O1g5o/9ebAm+sPW5sLyG7J3wusfCwiC7PHKscg=; b=Xt0m5gZt1YqRZuSasTehIWsUjvDoJ3STNwFbDCuAz9wNLTHDmHztvW3866Cu+lHrHB Cka3MZGVExAR5sCeeTKwIenp4EhpyFg3O0W6IYuSK/hVsTOnssWRKrbQTC1BCDx5Fl6H Pxw8vqqZBRfQqs4gliU9LOil4hgDG/yTCevA6EhiMANAFEYfY0FAT4pFj2HsFTfRVRKF sX2G4Sd3u/q2EZ2mJWXkeV30BPFP2UBlsoq8u7Q16pUziNtAVyW1ozqUuwN8uYYdIlRc VUVb7VTlAgIC20bWtiMcHupTWoT9zQBi905b4C95Yxkp7UNEFk1hRL76jQPUex/mx5+N VJ9g== 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 gn31-20020a1709070d1f00b00780a8f6b0a4si3805927ejc.281.2022.09.17.14.16.29; Sat, 17 Sep 2022 14:16:30 -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 2FE7B68BBB8; Sun, 18 Sep 2022 00:16:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-2.mx.upcmail.net (vie01a-dmta-at01-2.mx.upcmail.net [62.179.121.146]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 45B8A68B9F1 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-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oZfAM-00GP6r-Uz for ffmpeg-devel@ffmpeg.org; Sat, 17 Sep 2022 23:15:58 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id ZfAMoPQUB8s8UZfAMoEt8A; Sat, 17 Sep 2022 23:15:58 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id ZfAMoy3ewbZLDZfAMoILBG; Sat, 17 Sep 2022 23:15: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.4 cv=Ufwy9IeN c=1 sm=1 tr=0 ts=6326390e a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=Ou-dB1wDnAJ2Pr8qICMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 17 Sep 2022 23:15:51 +0200 Message-Id: <20220917211557.11547-3-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: MS4wfE9fZPqyOvB56wBnmFJoAeXs0Ut08ojTc7zBz/CuMTKjkSIi96PpO7MwzUg5Z5XPsUUQwoqaiVgpx8rAEpxXqYsAD13WL/uSO1fGaxi9wInQnv/J8P8t yZiX+5MAwRD0L37kvUKH+T91/oQH53dX16NQUArCcTRec97NwOwselzOs3Ssws687qZ720F0QWTFlg== Subject: [FFmpeg-devel] [PATCH 3/9] avformat/asfdec_o: Limit packet offset 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: wLMDFFLyGrF+ avoids overflows with it Fixes: signed integer overflow: 9223372036846866010 + 4294967047 cannot be represented in type 'long' Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_O_fuzzer-6538296768987136 Fixes: 50993/clusterfuzz-testcase-minimized-ffmpeg_dem_ASF_O_fuzzer-657169555665715 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavformat/asfdec_o.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/asfdec_o.c b/libavformat/asfdec_o.c index 48b7d17322d..e837ca62e7f 100644 --- a/libavformat/asfdec_o.c +++ b/libavformat/asfdec_o.c @@ -1242,6 +1242,8 @@ static int asf_read_packet_header(AVFormatContext *s) unsigned char error_flags, len_flags, pay_flags; asf->packet_offset = avio_tell(pb); + if (asf->packet_offset > INT64_MAX/2) + asf->packet_offset = 0; error_flags = avio_r8(pb); // read Error Correction Flags if (error_flags & ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT) { if (!(error_flags & ASF_ERROR_CORRECTION_LENGTH_TYPE)) {