From patchwork Sun Mar 26 22:26:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40851 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7a30:b0:df:834d:2c1a with SMTP id t48csp886101pzh; Sun, 26 Mar 2023 15:27:23 -0700 (PDT) X-Google-Smtp-Source: AKy350a1ZgY5xuZdpLNP+HJYdSFMlshVYwR9WNB6/BEnJ+yCmlNiXRh2Ra/E5JYUsBvGKwpI+XTg X-Received: by 2002:a17:906:af87:b0:884:9217:4536 with SMTP id mj7-20020a170906af8700b0088492174536mr10457781ejb.64.1679869643059; Sun, 26 Mar 2023 15:27:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679869643; cv=none; d=google.com; s=arc-20160816; b=nJoLC8nHfzTF1vfbiOHnwZ/GB9N3pZTz1A69f5/XrS9O++b8lISKBGYSfnIBPv141Y dFQqshMF9n9BTZ7SbmGAhbvRh5iFa5IKA9KABQf6I41aXWJ8arjW7uIW4Wf1Zk3gcycn G9WkbyMNATi/k9PDYgzYY0I9Jqj+ttGiwW7lqCaQOlMw1A9ZMZgvA8wbHHvvuRarBDrA KuxcaqtzMvStwJ9HEFtE/nU0kZ05d8lwHss9UusjvPECCDL0QoeSRVKp2L3UZoLwz78+ eWg2ccnrCuaI0WWqEFaUGuSNvd4GU7nC/A5j8jmXzUDxXSfOZsTAIenGRhN/DZ+g6Clu 17+Q== 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=CmxqVXKwa7iEv5O+4ltCvlWgiTUYWm5nEWvRP/nCPXI=; b=oO3HrooasARtj7juhVr3eGM69kvWMgB05J4/S+l8FVocxRKQDTXjkbIwth0BjrwWyf hxcjMurAhUGOhCHQx4JH78B5WC0AGZNodXUCoC+Yon96gTqsT7pyXxfDaSg/aLqWlgBo e7Wl2YAcBaZu+/XziMnmC8QqnLHaJ1TcfpCA6Fs+Sf7MVS7qvjyhHZaq8j9LvP5it7pH brBr3YhGK80tQrFpnDhRxPOCynXvsBRxuddbPoxX3y2AQDormlEul7nyvsmWujP8Ju4A ejdTQjb86YJvyArZUO+MPumPPXrctLaVq/xDvhilR0i/5zUAziV3mKxb6eKDgOOgj7RJ RsiQ== 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 xa13-20020a170907b9cd00b009334f7bc132si8746344ejc.947.2023.03.26.15.27.22; Sun, 26 Mar 2023 15:27: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 A294668C68A; Mon, 27 Mar 2023 01:26:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FB5D68C61C for ; Mon, 27 Mar 2023 01:26:46 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id B2BAD240004 for ; Sun, 26 Mar 2023 22:26:45 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 27 Mar 2023 00:26:42 +0200 Message-Id: <20230326222642.2489-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230326222642.2489-1-michael@niedermayer.cc> References: <20230326222642.2489-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/vp3: Check width to avoid assertion failure 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: UoXDT+IdLrm0 Fixes: Assertion failure on x86-32 Fixes: 39641/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_THEORA_fuzzer-5925660741206016 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/vp3.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index 9660def675f..22348559461 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -2353,6 +2353,8 @@ static av_cold int vp3_decode_init(AVCodecContext *avctx) s->avctx = avctx; s->width = FFALIGN(avctx->coded_width, 16); s->height = FFALIGN(avctx->coded_height, 16); + if (s->width < 18) + return AVERROR_PATCHWELCOME; if (avctx->codec_id != AV_CODEC_ID_THEORA) avctx->pix_fmt = AV_PIX_FMT_YUV420P; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; @@ -2919,7 +2921,9 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) /* sanity check */ if (av_image_check_size(visible_width, visible_height, 0, avctx) < 0 || visible_width + offset_x > s->width || - visible_height + offset_y > s->height) { + visible_height + offset_y > s->height || + visible_width < 18 + ) { av_log(avctx, AV_LOG_ERROR, "Invalid frame dimensions - w:%d h:%d x:%d y:%d (%dx%d).\n", visible_width, visible_height, offset_x, offset_y, @@ -2965,6 +2969,8 @@ static int theora_decode_header(AVCodecContext *avctx, GetBitContext *gb) } else avctx->pix_fmt = AV_PIX_FMT_YUV420P; + if (s->width < 18) + return AVERROR_PATCHWELCOME; ret = ff_set_dimensions(avctx, s->width, s->height); if (ret < 0) return ret;