From patchwork Sun Mar 20 23:30:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34875 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1219175nkc; Sun, 20 Mar 2022 16:32:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuVMvTy1no25vQfFr2FcSu85fmG7DQoRlkH3wapNj52bOxwXzWUw3Vj8Gv8c6px0RTaVMJ X-Received: by 2002:a17:906:9b89:b0:6da:ac6b:e785 with SMTP id dd9-20020a1709069b8900b006daac6be785mr18611667ejc.295.1647819143957; Sun, 20 Mar 2022 16:32:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647819143; cv=none; d=google.com; s=arc-20160816; b=kVh0nrkZHfkUkTSQ/6AMphqC6/1h2Q3dgePxR9yejCW+415V3c3ULuTgZUp+t6dGtl 7CVmZ84uXSYUjZSKFjHGtiy2aIXwThrWOkSC98m+7q1BpakCUfUeBklghz4P2k/4H9Pj np3Mdg78HXKRSmjhXdjIbwg48RN4mW9bv8af/M3s3hZxRn3hNvUz6mJvuvEhDee4anpv tiK9vsOk039YOeuRX8XiFbX6GooGxJBNbY0twZNWFhvaiDWmRxgwf3sucER0I3RcsXdP 5C3ONYDvtjZZ6Vg5DNr9DFGBsCIbhzG1IN51mrcU29kWbXgjrMNnnTEaWDvtLPP1tKAK w6Ng== 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=DJJ8NbPnyOwDgvM9pjhzA8+FviBqfEXXXUnp0mtMl5Q=; b=LgKcIYp3LsOGLAjfPd+CLibYq6O9uDtt1wIl2Q/Udm7bYDbnsofdRC96S23Ivir225 J55dr/D1p8JCa9v3aJ55WP9NlfycrAnHI5DWmEj03I5n9XTH82CaAX/3nyfrbOYK1a7W rR9hGsAM5Kku6zKLmuvStTi+FEfCzzVxOQVMXpxoqdFKVCCkgc1BrcY+UDbZftjCxNbC jQyPviBxvESZFdJY0qn0Njo4IhLfslvVVfxrs5qgmJNkygGpyn1GgclC4Rlo0p7kbvCf 9T/Q4QbtLnuIsWrz5bZxb8boDX0JKdneJK2y1dmT4Jo2Am/HUNXQvLO0NxZYBx5ROMvh W30w== 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 hr39-20020a1709073fa700b006df76385d16si6380634ejc.438.2022.03.20.16.32.23; Sun, 20 Mar 2022 16:32: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 6251A68B1AE; Mon, 21 Mar 2022 01:32:15 +0200 (EET) 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 CD29768B180 for ; Mon, 21 Mar 2022 01:32:12 +0200 (EET) 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 1nW51w-00FjuP-AS for ffmpeg-devel@ffmpeg.org; Mon, 21 Mar 2022 00:32:12 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id W50jnGLSSSgGFW51wnIvbw; Mon, 21 Mar 2022 00:32:12 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id W50jncmy08eSWW50jnwqUz; Mon, 21 Mar 2022 00:30:57 +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=KKE5sHJo c=1 sm=1 tr=0 ts=6237b940 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=rdUlEgyfh3Q47DYJCNIA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 21 Mar 2022 00:30:56 +0100 Message-Id: <20220320233056.18169-5-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220320233056.18169-1-michael@niedermayer.cc> References: <20220320233056.18169-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfMVjhG9FiuDD+u/Oue7wdoGVIXWWbT9krJbVvbKzZSyz4hBJxwFqibMVHQj6phZMpjD1FXwg4d5etkUSNrB0KXaWQfIyBM3mYUjiOLUfVI3g4xrMp358 Pl2526W4mJdhEAaCnQHvBxu6MOicUz/AgZ0M/0uI0xv0dKBjhcRvuI/aWqmRe8vZTxzvvhob5ViYfg== Subject: [FFmpeg-devel] [PATCH 5/5] avformat/aviobuf: Check buf_size in ffio_ensure_seekback() 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: 9wyqLqgzRWb7 buffer_size is an int Fixes: signed integer overflow: 9223372036854775754 + 32767 cannot be represented in type 'long' Fixes: 45691/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer-5263458831040512 Signed-off-by: Michael Niedermayer --- libavformat/aviobuf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 29d4bd7510..33bc3c2e20 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -1062,6 +1062,9 @@ int ffio_ensure_seekback(AVIOContext *s, int64_t buf_size) if (buf_size <= s->buf_end - s->buf_ptr) return 0; + if (buf_size > INT_MAX - max_buffer_size) + return AVERROR(EINVAL); + buf_size += max_buffer_size - 1; if (buf_size + s->buf_ptr - s->buffer <= s->buffer_size || s->seekable || !s->read_packet)