From patchwork Sat Feb 18 23:18:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40445 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp862798pzk; Sat, 18 Feb 2023 15:19:03 -0800 (PST) X-Google-Smtp-Source: AK7set9DIPRQD0vkR1VI+HRsVjNZpDYIwHGWDISnz9M0TX1TcErJqbTTfh4AHNyvWGIkbl9s8rLk X-Received: by 2002:a05:6402:40e:b0:4ad:73eb:9566 with SMTP id q14-20020a056402040e00b004ad73eb9566mr258859edv.38.1676762343526; Sat, 18 Feb 2023 15:19:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676762343; cv=none; d=google.com; s=arc-20160816; b=QjxFGmulC+AetGWGITKEit439AYn8n8bwy8YaTLOUItsMAwGFoPahLVWPZsvPZ+Y5e itmA9SZEa1OZmVqnXcaeDFSrJFjVeurzAGatY/k19EZ0+OouXb6CrFqlaVFpjIkiBIKP 5fPtV5jxxj6mkd79TL4B8t/KV5M6l/P/PPb2C/Gd0Q+QlVDwrODtwXVpJW7b5kPjeLws xKM7hINq26eBe+OWXtfNprKzzHr+HIpe2crHkONWmzZgYHJWpO65dfJ/kk4iM5NMRNnJ 9dtQQfkXed6RulverNLSHQQFb2tjjtWYdm/cQ9NGUEzRad8fPlqtMVvEh3Ka1oxeBolS dqdA== 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=5WP2zrqjFYjK7pDEyIhwHiaANpeVyic+HHXAgp5YX6E=; b=R+B/4fmAORiAs8Sisn5U+zaxj61kUafheUaYaxcAAussCbNQFQ45Ef/nYsiUAg5yD2 l2cdo8xL5drCF0qpUS9lg6R/Yo+AXPQh9NOCzzfEFKuYSmkMX/VhxNTFBljpGwKOal0M qGBFHHhpTjI/oRf5XnJcGcd/fecFphtzDpHGYtBIIO5vaj+w1p2xyXtYHyBwPcIVfIfp 1gVseGC5cSmcUDcb9pOI2twtuNSwXNAHC5lmui7xt9yCmncB7w753CcbY6lgCUgtKcVA eqzhKTV3XVdwYHYCZad4eWhWf0OShNfvgF6OqwXHealkPQ8KzKU8nSRR4p/zs5HQgIE1 hSMA== 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 ay10-20020a056402202a00b004acc68a3d5csi9952479edb.304.2023.02.18.15.19.02; Sat, 18 Feb 2023 15:19:03 -0800 (PST) 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 4D29A68BF08; Sun, 19 Feb 2023 01:18:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88FEE68BE7C for ; Sun, 19 Feb 2023 01:18:52 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 9DB2960004 for ; Sat, 18 Feb 2023 23:18:51 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Feb 2023 00:18:48 +0100 Message-Id: <20230218231850.20522-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/ffv1dec: Check that num h/v slices is supported 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: t8rCa7jH47At Fixes: out of array access Fixes: 55597/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FFV1_fuzzer-4898293416329216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/ffv1dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index d74786cec3..180d24e695 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -475,6 +475,11 @@ static int read_extra_header(FFV1Context *f) return AVERROR_INVALIDDATA; } + if (f->num_h_slices > MAX_SLICES / f->num_v_slices) { + av_log(f->avctx, AV_LOG_ERROR, "slice count unsupported\n"); + return AVERROR_PATCHWELCOME; + } + f->quant_table_count = get_symbol(c, state, 0); if (f->quant_table_count > (unsigned)MAX_QUANT_TABLES || !f->quant_table_count) { av_log(f->avctx, AV_LOG_ERROR, "quant table count %d is invalid\n", f->quant_table_count); From patchwork Sat Feb 18 23:18:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40446 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp862874pzk; Sat, 18 Feb 2023 15:19:13 -0800 (PST) X-Google-Smtp-Source: AK7set/xfcXi0r8yfNnyJ+8sd9ll0TbAJVlMqYhMXcvFfU/53pesVSl3ueMOLsisROXEWKiiEi2E X-Received: by 2002:a17:907:98bc:b0:8b1:7b10:61d5 with SMTP id ju28-20020a17090798bc00b008b17b1061d5mr7625307ejc.33.1676762353740; Sat, 18 Feb 2023 15:19:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676762353; cv=none; d=google.com; s=arc-20160816; b=DN5SZajY1XlAJlSWGlYf/KLOa3aKtf82/x/hmn1iXtCFM40CwjPZdg2Grw6KfAk4wl SrNgbEU8uvyYBar2IcVNnc4VWOr2a+GNXTNN+S9hLLMkwgVGnYg3xUjWKvRhDXejNWCe Ds/OJiaE4HDBi0fLMf/Xetdt9C2L2m8aoDDV7bc+jVEn7lvaZslKcy5uwHCITAb1wM1E 4+ajPDYGkuXnNnTj63MdBtaUhZTlX1KK8wU5tqcrcnWkNHxBUnzE+iLB43XH+WKL/Jh1 ESve4hpEZwiZ21Vc9dVQnw5lKHvWuJlqjg1lX0lRvt5C8/zJDl2S51j6IinWdSGYZt1d Oo0Q== 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=wna8fUDsKp4Eu0AYSuk3/0W/zuXyJ0QCFS/REmyVIhQ=; b=GYJfrMWYXJ9gZ/93Dqpzn3aShdkHnWB5WPGQksSYpFPeI5WOwMLj0GiR06AA/5G4T6 IJpetQOkJrMK0to6un7wtfhmHymz0Awq+CztmKjeX54fFlcJ/dMA7fNpiWx3t3SofH12 cmiLQ40eai88l3WafFNb9P12d+YYr/PK4iI4WuIGeGz0MeKfT1h7++OVzrGzZAYOcwoC G+7h/vaACvZOqh8JGBDJoHgk2v+EkFr8Sw4v82bZLJU/dmORyv5KKVS6PgmNR+pS4hzb JU+60Mqeo1j+rIhKHQYOKSc3f4oqLZDtB7DkD6x8JJV4Pbrwo0QVV8gBy4Wll9LGMty+ u3hw== 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 b26-20020aa7cd1a000000b004acc7e6e1bfsi9528212edw.311.2023.02.18.15.19.13; Sat, 18 Feb 2023 15:19:13 -0800 (PST) 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 85A8C68BEB5; Sun, 19 Feb 2023 01:19:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B1BD968BA15 for ; Sun, 19 Feb 2023 01:18:53 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id D6648FF802 for ; Sat, 18 Feb 2023 23:18:52 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Feb 2023 00:18:49 +0100 Message-Id: <20230218231850.20522-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230218231850.20522-1-michael@niedermayer.cc> References: <20230218231850.20522-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/wavarc: Check if extradata has been fully read 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: fUGoWZxrf1uU Signed-off-by: Michael Niedermayer --- libavformat/wavarc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/wavarc.c b/libavformat/wavarc.c index 208b723716..2b5d1b99eb 100644 --- a/libavformat/wavarc.c +++ b/libavformat/wavarc.c @@ -22,6 +22,7 @@ #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "avformat.h" +#include "avio_internal.h" #include "demux.h" #include "internal.h" @@ -84,7 +85,9 @@ static int wavarc_read_header(AVFormatContext *s) if (ret < 0) return ret; memcpy(par->extradata, data, sizeof(data)); - avio_read(pb, par->extradata + sizeof(data), fmt_len); + ret = ffio_read_size(pb, par->extradata + sizeof(data), fmt_len); + if (ret < 0) + return ret; par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_id = AV_CODEC_ID_WAVARC; From patchwork Sat Feb 18 23:18:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40447 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp862939pzk; Sat, 18 Feb 2023 15:19:22 -0800 (PST) X-Google-Smtp-Source: AK7set+qmrmmBbSeowAR0KgPAb+izj9jQ0zmwz/7EOv8x/gnIZY3xy9XdHxt8JTZNW1xxXPjxkI9 X-Received: by 2002:a17:906:248c:b0:878:5f35:b8d6 with SMTP id e12-20020a170906248c00b008785f35b8d6mr5741044ejb.51.1676762362190; Sat, 18 Feb 2023 15:19:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676762362; cv=none; d=google.com; s=arc-20160816; b=LzpKqcW86aUKUUAOSEttQ/Y56jE4bJittQFnAxrNg+5FMyNZiJxgdc8igZtQBnv8qM IUtW/JMwutJNjDgK7hZwILRXVE9P8CuG5bvAQWt99J/I8sCzTXoR9jg2nawNcZSfv3Ud Ew/Tc+6H+JjaOr2BGIz27ns+BNMctZmc6XjqS20KmB4MlJxcbKG4ARo48bSatruk7K4J D8vUzncpUAHcLBSsrxadFAAyOjNb1aSijG3XxO64lTYqSPMegSog8Blm1WlUXZaJLbHf w6soVFSiGuK/0zG7sXpYH0CiBNhhMBB6q7vhhAY6nHkIzA5N2YLawXN7OMgYXWKVALFW W00w== 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=xA34dqcHkLoZTwkGyKl/B5CxkFnu7tNeuvCiQM+qO3g=; b=mtoqSLLbnO9hhRqnzS43yXrd6cWlKAv78mRkOh3+ViSAHxaJl/zJHtA5UHqKFK8OIj hrME4G8ziKffa+Cuetpvs6+CiS+v3Q6NYEpUaguXnuxdlnP1b1m9vp9gmpNmcd5cI17h gJuseaZGqCYdwLynHdEw5+olhLISzcZIKrYbbzfDl9xAG4Xt7QrJGnVuo5zgksYsobR8 FSrm52dYkYG9/Udg0pdruzR5dCNmzOKcLelYBXUK23UvsYbB2AcGp2Z9kd2UoDf2YvIU rBGT8Wlyc1qJ/iPVqLnhjJVbkoxIYMuqu41PV8xnb8s5pMERVpAhfno7/y4ynuVe52hv z8yQ== 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 uh39-20020a170906b3a700b00887cdc2699fsi8844280ejc.544.2023.02.18.15.19.21; Sat, 18 Feb 2023 15:19:22 -0800 (PST) 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 8C51668BF18; Sun, 19 Feb 2023 01:19:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCF9C68BE7C for ; Sun, 19 Feb 2023 01:18:54 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 0D258E0004 for ; Sat, 18 Feb 2023 23:18:53 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 19 Feb 2023 00:18:50 +0100 Message-Id: <20230218231850.20522-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230218231850.20522-1-michael@niedermayer.cc> References: <20230218231850.20522-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/wavarc: Check k 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: o+dRqT6nRXGO Fixes: Assertion failure Fixes: 55849/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6590105973555200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavarc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c index b626daa66e..8d37af9571 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -192,6 +192,8 @@ static int decode_1dif(AVCodecContext *avctx, if (block_type < 4 && block_type >= 0) { k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P); k = get_urice(gb, k) + 1; + if (k > 32) + return AVERROR_INVALIDDATA; } switch (block_type) { @@ -282,6 +284,8 @@ static int decode_2slp(AVCodecContext *avctx, if (block_type < 5 && block_type >= 0) { k = 1 + (avctx->sample_fmt == AV_SAMPLE_FMT_S16P); k = get_urice(gb, k) + 1; + if (k > 32) + return AVERROR_INVALIDDATA; } switch (block_type) {