From patchwork Mon Sep 25 11:42:54 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: 43892 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:2a18:b0:15d:8365:d4b8 with SMTP id e24csp1161334pzh; Mon, 25 Sep 2023 04:43:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG/kMKANn5rcFELZwsQ4kGmvYRYKU1/t8pT1lgpYzOMb543W1J1MiYvN+x54WOs+VZmNqxr X-Received: by 2002:a17:907:724b:b0:9ae:3a68:93e8 with SMTP id ds11-20020a170907724b00b009ae3a6893e8mr6160081ejc.14.1695642197477; Mon, 25 Sep 2023 04:43:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695642197; cv=none; d=google.com; s=arc-20160816; b=u3UfQJU8pKBcV+XGO84oQpSLc01QG4fIqw5ek71jOWONjnz9QSZAMV6J1l+9Qev6Aa 2W7MgopETKaDSn9KGo28BOXDsCho8r/INWOSZvxh0TdnBeuToJQRvztSPuWFFxhCsZHE Kd9sT+ec848u2ptSiSfBOKopAcn6fz4HhrQSDi3txm711ns4m5IkAlLx+CN0+/KC/o42 jA394lVjmLHHhdB/TXj76jA+a5Jr23cWpcsPCxFIy4rmuczZVQsLBO93qbGD82GEzrcw 5IJF9CdVWxFYcaIMSZDw3Q++dRILl813je9NDTyaXfMoQRh03IMFzm6asOEwkoh2OWHG E7dg== 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=eoyDVvKV24QcIm2iWhjO6h5uXGwnUU++F7ENI53/P6Y=; fh=N5ZEAcbS/qNmXhnh007L0O2hfBv3whDN0oICTLe1blQ=; b=yTR9HqZ1lWrP3WKlp+AQD8pWBXjAh//zAnJ9Qift6y5aKdejKMjqyn4sfTX6a+zTo6 mYhZvWapXQW3TOA0arPToTV0Mu4CLxvAKcS2G8fuxoqn6j6SDubyFqva7XV2B+2fF6+M PPJXzCd909p08Ij9EySc044BBl7Omp2+e45t50P04TwxH38HrwY6aTc51FDSSr7LDpbY IZo4udswW01/pP+KAj3vzA2Qfa4sqrB6dRF8DPKKGhxMBJohJW0KxAmo1CCHQsLlGMmh 4XaV1lLT0dSuTRxO3K9802/bQgovmIYrbx9qkn+6hRYa4QesLssPoz1pa52rvEWg9TCy Bo7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ispras.ru header.s=default header.b=cZygjPGz; 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 t6-20020a1709063e4600b009a22911b8a8si9051458eji.223.2023.09.25.04.43.16; Mon, 25 Sep 2023 04:43:17 -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=cZygjPGz; 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 D338468C960; Mon, 25 Sep 2023 14:43:13 +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 2449F68C5FB for ; Mon, 25 Sep 2023 14:43:08 +0300 (EEST) Received: from nick.intra.ispras.ru (unknown [10.10.34.56]) by mail.ispras.ru (Postfix) with ESMTPSA id 6097A40F1DEA; Mon, 25 Sep 2023 11:43:07 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 mail.ispras.ru 6097A40F1DEA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ispras.ru; s=default; t=1695642187; bh=X9xEDAwBCmoZcQJr1V5NwZElclP8pzA5XmuEFZJyIuU=; h=From:To:Cc:Subject:Date:From; b=cZygjPGzuNYThnX2UtqTemnZTMtRIjmzjSZL8cMBtPlF8eHy0sdnzkK6a1mtvX9wV ptsYY1YEFCiLe1ExBMBIjXh8oz0RxsCNwZB+Iw6bvR0g4Ypfo7IC2xrRGWM/DO6ROg ClXxnilSrA8ptW1pee5hxa4+cq85w+OK5T7lSZ5w= From: mezhuevtp@ispras.ru To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Sep 2023 14:42:54 +0300 Message-Id: <20230925114254.4041393-1-mezhuevtp@ispras.ru> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] libavformat\svs.c: Fixed, not it is in the right place 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: vJV2Hku4s6LV From: headshog --- 0001-Fixed-not-it-is-in-the-right-place.patch | 89 +++++++++++++++++++ 0001-Numeric-truncation-in-svs.c-57.patch | 41 +++++++++ libavformat/svs.c | 7 +- 3 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 0001-Fixed-not-it-is-in-the-right-place.patch create mode 100644 0001-Numeric-truncation-in-svs.c-57.patch diff --git a/0001-Fixed-not-it-is-in-the-right-place.patch b/0001-Fixed-not-it-is-in-the-right-place.patch new file mode 100644 index 0000000000..8373c56851 --- /dev/null +++ b/0001-Fixed-not-it-is-in-the-right-place.patch @@ -0,0 +1,89 @@ +From ea89215a6b5627f73c370381f07a87f1ccb146ea Mon Sep 17 00:00:00 2001 +From: headshog +Date: Mon, 25 Sep 2023 14:38:04 +0300 +Subject: [PATCH] Fixed, not it is in the right place. + +--- + 0001-Numeric-truncation-in-svs.c-57.patch | 41 +++++++++++++++++++++++ + libavformat/svs.c | 7 +++- + 2 files changed, 47 insertions(+), 1 deletion(-) + create mode 100644 0001-Numeric-truncation-in-svs.c-57.patch + +diff --git a/0001-Numeric-truncation-in-svs.c-57.patch b/0001-Numeric-truncation-in-svs.c-57.patch +new file mode 100644 +index 0000000000..dbfdf07e6f +--- /dev/null ++++ b/0001-Numeric-truncation-in-svs.c-57.patch +@@ -0,0 +1,41 @@ ++From a9b235e392024f1877d5c43fc0129e9eebb6aea2 Mon Sep 17 00:00:00 2001 ++From: headshog ++Date: Mon, 25 Sep 2023 12:48:22 +0300 ++Subject: [PATCH] Numeric truncation in svs.c:57 ++ ++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) ++-- ++2.25.1 ++ +diff --git a/libavformat/svs.c b/libavformat/svs.c +index b91d29f5a6..bdfb856184 100644 +--- a/libavformat/svs.c ++++ b/libavformat/svs.c +@@ -42,6 +42,7 @@ static int svs_read_header(AVFormatContext *s) + { + AVStream *st; + uint32_t pitch; ++ int64_t rescale_val; + + st = avformat_new_stream(s, NULL); + if (!st) +@@ -51,10 +52,14 @@ static int svs_read_header(AVFormatContext *s) + pitch = avio_rl32(s->pb); + avio_skip(s->pb, 12); + ++ rescale_val = av_rescale_rnd(pitch, 48000, 4096, AV_ROUND_INF); ++ if (rescale_val > INT_MAX) ++ return AVERROR(ERANGE); ++ + 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) +-- +2.25.1 + diff --git a/0001-Numeric-truncation-in-svs.c-57.patch b/0001-Numeric-truncation-in-svs.c-57.patch new file mode 100644 index 0000000000..dbfdf07e6f --- /dev/null +++ b/0001-Numeric-truncation-in-svs.c-57.patch @@ -0,0 +1,41 @@ +From a9b235e392024f1877d5c43fc0129e9eebb6aea2 Mon Sep 17 00:00:00 2001 +From: headshog +Date: Mon, 25 Sep 2023 12:48:22 +0300 +Subject: [PATCH] Numeric truncation in svs.c:57 + +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) +-- +2.25.1 + diff --git a/libavformat/svs.c b/libavformat/svs.c index b91d29f5a6..bdfb856184 100644 --- a/libavformat/svs.c +++ b/libavformat/svs.c @@ -42,6 +42,7 @@ static int svs_read_header(AVFormatContext *s) { AVStream *st; uint32_t pitch; + int64_t rescale_val; st = avformat_new_stream(s, NULL); if (!st) @@ -51,10 +52,14 @@ static int svs_read_header(AVFormatContext *s) pitch = avio_rl32(s->pb); avio_skip(s->pb, 12); + rescale_val = av_rescale_rnd(pitch, 48000, 4096, AV_ROUND_INF); + if (rescale_val > INT_MAX) + return AVERROR(ERANGE); + 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)