From patchwork Thu Aug 18 22:35:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 37357 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp573190pzh; Thu, 18 Aug 2022 15:36:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR7Ef63Qd++BRwlB3PJ+Upzl/MI6DRT2xHQeO022BQymzl70DgW6PP9fcRif+m3MWPnfpfSd X-Received: by 2002:aa7:dd50:0:b0:440:3e9d:784 with SMTP id o16-20020aa7dd50000000b004403e9d0784mr3800276edw.195.1660862170044; Thu, 18 Aug 2022 15:36:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660862170; cv=none; d=google.com; s=arc-20160816; b=WdSrdkdHLCdk7mbkrmqikdH+GhudvDaBXLcSh38zIKIUZw2UPvEl7Y77KiO304IiBv jfibMBUL/agzqaT/7ViIDW1HbCikZ1EaxT+oadZSjju9jYV/cbk/ltkeEAS26Kvx4U01 t7+misqEkSn/J+OGBHNkTAHmmFRqnKuw+TUnyz52fUjeusTOSsO/g6OI7eNweVTN4K/i eoVA7yDikJMZxDcAq+aLPHlLCnCpZXAI7209SyH6YtAs0GdN9oGbYlKzZq0Ap7mGZ5Rr O6/QSo+D2LF1ydmwq3fpoxrHrFWYESWop7vCizsM4MjpjPpJjW78ftSkt5bjt58CUP1b awnw== 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=zytvb0ULKN+NxRziahYy3q27DOAw6tMKBbs0g7w20OI=; b=lhzH/PdiOZGTR6kvYuXIemhgK0D5fgPjg6RqZ7V2xJ087xAxL2g66cYBF0bf9qTIvm ne/U6NEjVzPyeAnrOm3ok4gPF4kI95S+Jg93qDtxrNjnmq1xhLm0WujBzDNcNOqJiAv/ t+atW2rVn3zgbn1kH0JXUjy4WnYLUordd7pxqrNQlEsglwG8AQ1CHKqBlzd5b7PJN+0l DcMJBikrds2CfLjwQ3JAusSXk/ZPL+k/ZPaQH6ZSsXdEqw8UjAdZ888p5dimbUVdJkXU tZ/A4WrQnb84oYBaqZ0wLNOZAz28UcM1IYzdXAtmBYrRSrkC4Q3/3OaNAGHydKPBdk2T 6xtg== 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 d2-20020a50ea82000000b0043be28d93adsi1789599edo.261.2022.08.18.15.36.09; Thu, 18 Aug 2022 15:36:10 -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 93FF268B986; Fri, 19 Aug 2022 01:35:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-2.mx.upcmail.net (vie01a-dmta-at01-2.mx.upcmail.net [62.179.121.146]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E51668B8EF for ; Fri, 19 Aug 2022 01:35:38 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1oOo6z-005yPt-9J for ffmpeg-devel@ffmpeg.org; Fri, 19 Aug 2022 00:35:37 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Oo6yoxtTm8s8UOo6zolzmp; Fri, 19 Aug 2022 00:35:37 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id Oo6zox8158eSWOo6zony7o; Fri, 19 Aug 2022 00:35:37 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=62febeb9 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=NEAV23lmAAAA:8 a=zYVVvdDyoyOwFQBKpFYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 19 Aug 2022 00:35:35 +0200 Message-Id: <20220818223535.13078-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220818223535.13078-1-michael@niedermayer.cc> References: <20220818223535.13078-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNrlKKIuNjOqOxSwExg1paAz+K/HMROvtDXz85aSPLccGiRKyOo21KFKKPqpp4zachj6guYAPGlGyIyipUYLdnodjWUGjNSVx0ccSuS5r7gSj4Y4EcO0 pp+sGaJnImY1pOEc9qiRom0DkMdFXs0LvkWz6O+VK+/nnbw3p53l1XrT/2WcnVAmt308x1sXv1r47Q== Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/speedhq: Check width 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: VACib2UcCWA5 Fixes: out of array access Fixes: 50014/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SPEEDHQ_fuzzer-4748914632294400 Alternatively the buffer size can be increased Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/speedhq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/speedhq.c b/libavcodec/speedhq.c index c43de4f199..ffee5f973b 100644 --- a/libavcodec/speedhq.c +++ b/libavcodec/speedhq.c @@ -499,7 +499,7 @@ static int speedhq_decode_frame(AVCodecContext *avctx, AVFrame *frame, uint32_t second_field_offset; int ret; - if (buf_size < 4 || avctx->width < 8) + if (buf_size < 4 || avctx->width < 8 || avctx->width % 8 != 0) return AVERROR_INVALIDDATA; quality = buf[0];