From patchwork Fri Jun 21 19:35:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50041 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp739530vqz; Fri, 21 Jun 2024 12:36:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWWGo5hQ+2cIQvyWFs4V3juCJ7s90Sddi8YB2+2zAFwrIQyUe2062v5YbHWsZjQZosz56gKvmwvzjbebyFWMwVUKLe0cucDWm3Z1g== X-Google-Smtp-Source: AGHT+IGGR2JezMgancLh49/r7H+/473RbK1wgbor1WKVBBVwx26T9EPrXDzQ3/Q3s+DVCVXoIQgI X-Received: by 2002:a17:906:9c89:b0:a6f:b715:6cd9 with SMTP id a640c23a62f3a-a6fb7156d63mr612916566b.56.1718998561616; Fri, 21 Jun 2024 12:36:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718998561; cv=none; d=google.com; s=arc-20160816; b=X7l5nPiECVOuMzFAKTcMujTe44YTNewYq/cGStKLZYqJ6rUEn58cAQaBb6x3s8sD6M 8SriqgR1ecgDryajxbdgbipzFTewtvQ+F5OH9BDaPpu2Hi0zW8y3qn5wPvVSLginaCLO kA+U3FErSwPjWISIE/z0yUhELcxqFHfxRgIECGHO3ZRy+UMwZWkcqO0SmEYvSDdPTXp4 qJi5Y9EIGRKOyu2ZriY8QasPZkDxCOMY+53TZpIYqswaAJRP4fNLIG0uAiWRXAh0Z+Cy TOcxsIrvGEz2K2Oibanus37Cn6Fbzib08Cod6UbdB6ZsXNvpxGptkFyB5ZPGi3FmVNiM 2+MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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:delivered-to; bh=c4841EhhY+p5cyje81mRW+RRt4oFwaqj7is2yPROrz4=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=sn0XZ0nDomKPgZvZlQEeqyNTe8ZyYeAQbsxFuoZEkdveREgwwDcYI5hwO4cSedUDrm cZmU8mjoZubr7koiBQ4m+87bkXBxVoKe0k92o/xu0RCr5yYLAEIVsNE8M3R2B5rX6Iwu vaXJrj0zhty88po6p4xxk/1lae8q3Zn7/iXJkszJJX5+r6lq2ah1Gg09c3oqZc735dXH ugEE1XJyODOXyBxxUvgenv/19O1a0SX9SryIRQcn4U73TivdKoWuOF1VI9kzw5iYwWyx USwgJDABuNlHDX9ZDKx5Uqu6NgA7frXIGU0hqHptOE203yMyeGjegFCnC9viE8fCIBSB l6tQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b="g3jq1e/C"; 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 a640c23a62f3a-a6fcf5794f9si113747266b.755.2024.06.21.12.36.00; Fri, 21 Jun 2024 12:36:01 -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=@niedermayer.cc header.s=gm1 header.b="g3jq1e/C"; 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 99C2D68D79A; Fri, 21 Jun 2024 22:35:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71DA368D5CA for ; Fri, 21 Jun 2024 22:35:50 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 46C9B240003 for ; Fri, 21 Jun 2024 19:35:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718998549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=lMrYvaLGgDuD+oXSQrZPFsm0Tknb46xLzK5QOuG79P4=; b=g3jq1e/CoXszwU6vfyvqg7wa9nyYgfnYewy0jTr1Rl7q995p+lm/C1aSY/KUtDPsjXmRGd NcpW1iIZ4q442UinD3iyeyiFFmO6pQHn1252UctVw9DPrBBZint1qPCtDAiyruykMpBmBD QGo2+JFlXZbjQTt9JTFQRJLb+b8BkCRIYJcak2oBDlaqLHDwJu1xhz85liY5h1eCAtauua xYmhUSXm3XocLnJ6a17TX8n6gd+2qSLpbHSXybO2x+M1OCXgbfXGukHn3w5T2D74mP1cnT nbYG3vIhMhdkDgsRIdGojNZVc8b0NpdwzcGemnbNA6pxMWUEEL7XgsOAxfVUcA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 21 Jun 2024 21:35:48 +0200 Message-ID: <20240621193548.2923736-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH] avcodec/osq: avoid signed overflow in downsample path 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KgYpPOhaj1O9 Fixes: signed integer overflow: 865309950 * 256 cannot be represented in type 'int' Fixes: 69191/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_OSQ_fuzzer-6310214413385728 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/osq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/osq.c b/libavcodec/osq.c index 8a153330269..42a46b25ce5 100644 --- a/libavcodec/osq.c +++ b/libavcodec/osq.c @@ -325,7 +325,7 @@ static int do_decode(AVCodecContext *avctx, AVFrame *frame, int decorrelate, int cb->prev = prev; if (downsample) - dst[n] *= 256; + dst[n] *= 256U; dst[E] = dst[D]; dst[D] = dst[C];