From patchwork Mon Sep 25 11:27:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mezhuevtp@ispras.ru X-Patchwork-Id: 43891 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp1153561pzh; Mon, 25 Sep 2023 04:28:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+EoK3TfaUEnoJvnZ5o5Vq3tvLCFudxlUEoWHO42xpW/AJMMiuxwX55+JG7Jetar6okdQr X-Received: by 2002:a17:907:77c5:b0:99c:f47a:2354 with SMTP id kz5-20020a17090777c500b0099cf47a2354mr5932604ejc.70.1695641292472; Mon, 25 Sep 2023 04:28:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695641292; cv=none; d=google.com; s=arc-20160816; b=q42GfMaMl5x2GRiXhEKo63R2s3CzsxBct5YNgzLa9tRPcIdiUBi8vBJpekVpQTHGZ8 m8Z6ym6+TYkoHHF+/CNo+HEDpbQ+hUJ6ZNMpjA/Zt0hQmMalvrEb6+XEEvi+O0rduqce 6/pDxlb1YtxqYU+tsvmkPc/jChS8U+3qjpUDuHWeNwn9b5zsWMuztjCBKm5s31CL3dyO MkE3c9WYBh+WOP4KgVj1UyKVkvhmBQN7Ad6AXsFsSdypxbMzBwgfFdtihSSIvUtm62Ds FJPIm7oM0k5r0NgSTL2xh1zuk6UTgrCN4e3+Ig8CnfTP5lHS8cmm0U4tu+qGA6iyD2ir LBTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:dkim-filter:delivered-to; bh=DDLxg/2OFMU2K4Iv7aIcoPPAGoLy3Gobz7fWy7xVr1w=; fh=N5ZEAcbS/qNmXhnh007L0O2hfBv3whDN0oICTLe1blQ=; b=MRr0a5+JM1mzGDfylQvvc8RBbaSZ7BHEEPwaB+vbC20JFz5DSmLk26JMYAwhceqxWC pN76s+0J+6BcRQD26XTJA+0aIVtrrtl8XNwr37Nyk46ii0puyH9hucikXNLDo4HfpB9o sk0ErQ/9vShAKQ0U7lZsowRiU9PeQbh8KA+HnnUFVxHK0TVtsdnSJeh/I+qwSIvLhh+W dr+TJ8NxjofAQTTxRFG1VynzrekMsFHMYD9hSJXVSWtcFlzQABGVwgQIDz+jhKyIwprm 0vtB1XdlKYcrjzta69ySJRFYDJUh8HoDpa80xcGPKH+4yUuatg+DrOJKMmaitDEyqvuq 6EhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ispras.ru header.s=default header.b=IU4Lf4tU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g23-20020a170906595700b0099bd4f74cbesi8922659ejr.615.2023.09.25.04.28.11; Mon, 25 Sep 2023 04:28:12 -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; dkim=neutral (body hash did not verify) header.i=@ispras.ru header.s=default header.b=IU4Lf4tU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ispras.ru Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A593B68C96C; Mon, 25 Sep 2023 14:28:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.ispras.ru (mail.ispras.ru [83.149.199.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5651A68C8E5 for ; Mon, 25 Sep 2023 14:28:02 +0300 (EEST) Received: from nick.intra.ispras.ru (unknown [10.10.34.56]) by mail.ispras.ru (Postfix) with ESMTPSA id 802D540F1DDF; Mon, 25 Sep 2023 11:28:01 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 802D540F1DDF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1695641281; bh=d1IjIWCO6S07dLbFVF73Eq6ZbEZ8cxbsbpzHrk/4csw=; h=From:To:Cc:Subject:Date:From; b=IU4Lf4tUipapN3vF3sLxZ81dg2BulGDmObbZWKoefKFgME9sPqYnNbG/qp8gFvSf6 4oZu6uvBxP/vGkcgIFvSiWqfTLmH3XwcHpXzac7uRqdN9x6ruS0o7rgQQNkvqMU8OW CM14a6hHLLk1CjZdQ+1EWz8pzv+mzvDC6SWaPwrU= From: mezhuevtp@ispras.ru To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Sep 2023 14:27:37 +0300 Message-Id: <20230925112737.4039135-1-mezhuevtp@ispras.ru> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] Numeric truncation in svs.c:57 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 Cc: mezhuevtp@ispras.ru, headshog Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9Iu8/DwYEJtw From: headshog Hi! We've been fuzzing `ffmpeg` with [sydr-fuzz](https://github.com/ispras/oss-sydr-fuzz) security predicates and we found numeric truncation error in `svs.c:57`. In function `svs_read_header` on line 57 field `st->codecpar->sample_rate` has type `int`, the type of return value in `av_rescale_rnd` function is `int64_t`, so the numeric truncation may occur here. Then value of `st->codecpar->sample_rate` is passed to `avpriv_set_pts_info` function parameter `unsgined int pts_den`. In a way not to break API/ABI, I've added a checker for valid `sample_rate` value. --- libavformat/svs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/svs.c b/libavformat/svs.c index b91d29f5a6..54f24f539c 100644 --- a/libavformat/svs.c +++ b/libavformat/svs.c @@ -42,6 +42,11 @@ static int svs_read_header(AVFormatContext *s) { AVStream *st; uint32_t pitch; + int64_t rescale_val; + + rescale_val = av_rescale_rnd(pitch, 48000, 4096, AV_ROUND_INF); + if (rescale_val > INT_MAX) + return AVERROR(ERANGE); st = avformat_new_stream(s, NULL); if (!st) @@ -54,7 +59,7 @@ static int svs_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_PSX; st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; - st->codecpar->sample_rate = av_rescale_rnd(pitch, 48000, 4096, AV_ROUND_INF); + st->codecpar->sample_rate = rescale_val; st->codecpar->block_align = 32; st->start_time = 0; if (s->pb->seekable & AVIO_SEEKABLE_NORMAL)