From patchwork Wed Oct 4 22:59:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44155 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6384:b0:15d:8365:d4b8 with SMTP id m4csp31252pzg; Wed, 4 Oct 2023 15:59:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUsGk1tg7UJOIau24LqT+X08cYMKKttEnU3Y8GPoXgdgCqsnqRtwN9EXUmpWGL/YNoDgNi X-Received: by 2002:a50:fc11:0:b0:52a:250e:a052 with SMTP id i17-20020a50fc11000000b0052a250ea052mr3314367edr.7.1696460374877; Wed, 04 Oct 2023 15:59:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696460374; cv=none; d=google.com; s=arc-20160816; b=RMoBweA+MXK4198c9e/EgwRHPPCH1RqRYGGQ/kQ0cSZe2JY8JAh8ezrAilAsF+yW8D DuF5w0KHdzj6Cu7P6xgQyy+pSaIekc0nhuq2sD8vvB9zvhXLDBwDbUnkir9BGaC2dT+P yPedjFNm9FZx8hrGgj89ybvu2k7z9ZJfgc1vRZgZlgkIbeMvbd0CJXYhF4fIXtyE32Qm PwmW9VyLBIuDtVYNRw/ZcIsiSe6+CM5TxXbdT2v3lkDPX7wSSXDA8bUuxMwmuOkQgpGr 96eCurnDngyh39qUOzCMA5llBJM1aO0bIgsrld9RPk2Rvn5mjR6UO4DYQIN39enAgHxN 8y4w== 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=8uprkJwFWmYADtKV4MUyhtkh0D87LjUST8W/HLrywZc=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=YjQ3CLiPG6a5vWYP4MOc7+E5ApQKPlejFp7+tMHkRJjlqxnNwNgZYzJlZVrtyggeJa Ndf+sg3exjnVrRZnaHFweNMW82ykOo6wKbu8jK3UBnyC2kn9B/NQP8Z3jczeOEU4KaL4 S6mX2xaZDZm3M80HTyU5PjKhbx6FzNFWivNQA17trS7v6Fu+bUZhvHjwiCLJtSF++FHQ SocwFcG0keIDwd5PRYCa6K3tV0dFoAZRN3nCMkPm0tO4KI88L2NFd/iq7Hux+Q+f7QDw dodAYZSN9SQKI9u1MR+bQqAaW9YQtV93JTAtXj1hBd7FWQhKC8FwKB+c+fVrAxPY89EE ik6Q== 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 l15-20020a056402028f00b00536309d7b14si110034edv.516.2023.10.04.15.59.34; Wed, 04 Oct 2023 15:59:34 -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 2889568CB0D; Thu, 5 Oct 2023 01:59:30 +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 B782F68B752 for ; Thu, 5 Oct 2023 01:59:22 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 0487B1BF205 for ; Wed, 4 Oct 2023 22:59:21 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 5 Oct 2023 00:59:18 +0200 Message-Id: <20231004225921.30287-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-Spam-Flag: yes X-Spam-Level: ************** X-GND-Spam-Score: 215 X-GND-Status: SPAM X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/jpeg2000dec: Check image offset 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: TOwiJP1/U4/6 Fixes: left shift of negative value -538967841 Fixes: 62447/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-6427134337613824 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeg2000dec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index eda959e558d..691cfbd8915 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -238,6 +238,11 @@ static int get_siz(Jpeg2000DecoderContext *s) return AVERROR_INVALIDDATA; } + if (s->image_offset_x >= s->width || s->image_offset_y >= s->height) { + av_log(s->avctx, AV_LOG_ERROR, "image offsets outside image"); + return AVERROR_INVALIDDATA; + } + if (s->reduction_factor && (s->image_offset_x || s->image_offset_y) ){ av_log(s->avctx, AV_LOG_ERROR, "reduction factor with image offsets is not fully implemented"); return AVERROR_PATCHWELCOME;