From patchwork Mon Aug 7 00:49: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: 43154 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp1303272pzh; Sun, 6 Aug 2023 17:50:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGDXvkjuygCrTUuNIipCXdYOvJVxuwvpM7HKj3dRIKFlVVHGisuN4A7xchIDTBz51CVPx3c X-Received: by 2002:aa7:c0d1:0:b0:523:2b8c:d901 with SMTP id j17-20020aa7c0d1000000b005232b8cd901mr3859434edp.10.1691369428725; Sun, 06 Aug 2023 17:50:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691369428; cv=none; d=google.com; s=arc-20160816; b=IXoUZUIiynm2sD+oDKjmyW9QiAV5YZV+DfA98T0uXBfVmUik0Ksq6RUiSARKCj3RRd dESHu8L6jafhQbbd6Kw3gWeknyMSv4+LYAJ1aUhPLkA8bhgrwLpAlRo8RxG47wAJwTcY 6+5VC8t1mmwmUNj0An6Z6F2/T9q9KCMC2PqXWv4CEQ+TEiDfgOwo1+UyPcjoz1RyWFZ9 6kyfcFb+yyq0nepHZ6EJeFm5zeAlLNE8vYpr0iuLxlEZR9CzF+Vg+p5umNOCwxaU2Gc6 9ze2cvvb4FbDC9O4JqtY+7guyNaOz0AE3IVQnlX6Qw0EazA+MBSveO9LG86cE1emHUam h2wA== 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=XtOOccyEwwD4ZNEdM6x4xwuSPL8p8XzsQvAsEm90QZM=; fh=YYwLYmpaV0Fpw/rxmSKNRLS2XzDkAlGbHATiKOPtZrY=; b=0cmaYqeC18/zh/XcTckglTx8nvRw8LPDRjgks0znf9ZV/fXw31G24m8Clzbe7m6Ojz 4BSfDXxYa6wr0vnVjkf64swU5P5Tiv90S3Me5SIL0+c+5WjuDXy7gLj5gjbyYO5qHXYL 4wllzXxrmrJ3Gi+pb+OtytyaAVlzg9zn9ZuXJx4FEzBooHINfiZkL/QdWcvuTphYTags CaArHAQQ6OEkkcmQ6+S+Ldsz41mXgKrptTMCF+df1LYSfZ7+cb4wEbpbTWiv37V2p8jK kK21UAdbYdpIFVTMxPb0CocKLM9aO3upkSxly7eoVxGHDnJo9IWXP88Ad1fN0CS6XW/j y/Sw== 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 r19-20020aa7da13000000b005231f2c0555si4102573eds.314.2023.08.06.17.50.28; Sun, 06 Aug 2023 17:50:28 -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 B935668C76F; Mon, 7 Aug 2023 03:50:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0618868C755 for ; Mon, 7 Aug 2023 03:49:53 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 6A75F1BF204 for ; Mon, 7 Aug 2023 00:49:53 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 7 Aug 2023 02:49:48 +0200 Message-Id: <20230807004949.31634-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230807004949.31634-1-michael@niedermayer.cc> References: <20230807004949.31634-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 4/5] avcodec/wavarc: Check shift 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: 97qrN4yIFAgS Fixes: shift exponent 1285 is too large for 32-bit type 'int' Fixes: 60870/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-5332050340347904 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/wavarc.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c index 8e4c7d17dc..0dc5849679 100644 --- a/libavcodec/wavarc.c +++ b/libavcodec/wavarc.c @@ -218,6 +218,10 @@ static int decode_1dif(AVCodecContext *avctx, continue; case 6: s->shift = get_urice(gb, 2); + if ((unsigned)s->shift > 31) { + s->shift = 0; + return AVERROR_INVALIDDATA; + } continue; case 5: if (avctx->sample_fmt == AV_SAMPLE_FMT_U8P) { @@ -314,6 +318,10 @@ static int decode_2slp(AVCodecContext *avctx, continue; case 7: s->shift = get_urice(gb, 2); + if ((unsigned)s->shift > 31) { + s->shift = 0; + return AVERROR_INVALIDDATA; + } continue; case 6: if (avctx->sample_fmt == AV_SAMPLE_FMT_U8P) { @@ -586,6 +594,10 @@ static int decode_5elp(AVCodecContext *avctx, continue; case 10: s->shift = get_urice(gb, 2); + if ((unsigned)s->shift > 31) { + s->shift = 0; + return AVERROR_INVALIDDATA; + } continue; case 9: if (avctx->sample_fmt == AV_SAMPLE_FMT_U8P) {