From patchwork Sat Dec 16 12:16: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: 45180 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp6265628pzf; Sat, 16 Dec 2023 04:16:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IGu6kbmWP0lHxwCo/SUaLc8YeYMgW+Cl/a+p091NiqOePHGfOitqI86HDQa+csUGwK2gG3R X-Received: by 2002:a50:d71b:0:b0:551:8349:c1c with SMTP id t27-20020a50d71b000000b0055183490c1cmr5225033edi.74.1702729012783; Sat, 16 Dec 2023 04:16:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702729012; cv=none; d=google.com; s=arc-20160816; b=qfIL4y1kDPy3ph8kxkHMVaEICEPXOIgyEzICz4vrddVKmEwmmiNONBy09tlHgtCRUR XcDjEHaNlSofj62ppKZm1QtbBgDWO8a4087JEdk//RYaFu5F6QZ2LIb+nXF3UePhi9dF G/U751a/xZ5ER8cME9LxHn649UbWEvjh8ZYL+fyurq3iDPqglY3JaPRP6xY1Oakg94pz fCie3GQ1G5MQXOEKz8iug/6VLfOzB3JWvPU8txtST5x7dv71KC0pcsi+QzyAgj8ZbvS7 0q4ygDXFx/YF92Oq7fELLpk5/VamhcOxfM2JOOwfL4QGaR+5OrtSJyF69W1of7IIL8gD s6Ug== 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:dkim-signature:delivered-to; bh=aPrwF4C1VGAh+zG1WEqznLpGwy2tbOnK9Xbgf4rweQo=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=a+YyYvzBLkHqlpThk4SFQcbHSzrbpHohGSeYZXthJef/9oUYARx2R35z1UsijsCRPM /7XvssfTuRLqFmba5NVSI3e6d40yyEVQpedOHugsMO/zDzFkkNBXa62iaq0/DVUJPs/k RDA+nkAkcQ3hxQYF7bSUuWEjVBuS7mbL8nfPFfZpOoxKNrzFlkyWTyWGNpUrdD4fklV2 eYaCT5nKRGqCtQSZwLtttK4lr1HRvstEdrfvQ4kVkRGJliXjLoGDu8Xd5j2+DJ5hcm9u l6T7GYv8svm69iYv+6fgInUXAYRmKQmDrIBCAhDA00kAaByNe3CkHn8V9JV2wA50fatr ODmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=NMzzgRwg; 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 ck26-20020a0564021c1a00b0055307e61a66si335685edb.39.2023.12.16.04.16.52; Sat, 16 Dec 2023 04:16:52 -0800 (PST) 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=NMzzgRwg; 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 5FE4A68D0C8; Sat, 16 Dec 2023 14:16:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA8FE68D093 for ; Sat, 16 Dec 2023 14:16:22 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 09C64FF803 for ; Sat, 16 Dec 2023 12:16:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1702728982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:in-reply-to:in-reply-to:references:references; bh=wicC0ry7NYdcB0IHLT+7nENP2uR8yQ+tWSZClQcIQNE=; b=NMzzgRwg/MpxxNn58+pG+95i6W/v46mFoIViTTHtkJxSOwJE3n7EO5Di/hzHvw/tpKgI+A jGFeJgjCTpPgbzhqsDJY+SWipkoQngcD0fwrQE2K94zOS+CwasnZeInSwY0sF7+zMiKvUd lZHCoFLir+/6OQftUcCOu8dL0HGDI1aOWOhD21LxV0k0xnh6S3W5F4+f5cye422gLZFXAk UCcQJU5fr2opb2VnVXalmLHe3rbTtsZh/O9470Bkgp3FNSQzmuQT8ICfjqml3YzvyL1ie9 8Oh9rqUHsNQK1na2GhaS1rHE4nMzIjjXiGO3zGoC9WrOMWhhINxdRO05j968Qg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sat, 16 Dec 2023 13:16:18 +0100 Message-Id: <20231216121619.19436-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231216121619.19436-1-michael@niedermayer.cc> References: <20231216121619.19436-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/jpeglsdec: Check Jpeg-LS LSE 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: n9kaC/WE+EiN Fixes: signed integer overflow: 2147478526 + 33924 cannot be represented in type 'int' Fixes: shift exponent 32 is too large for 32-bit type 'unsigned int' Fixes: 64243/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEGLS_fuzzer-5195717848989696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/jpeglsdec.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c index ec163b8964d..c245cf0279c 100644 --- a/libavcodec/jpeglsdec.c +++ b/libavcodec/jpeglsdec.c @@ -382,6 +382,19 @@ int ff_jpegls_decode_picture(MJpegDecodeContext *s, int near, state->T3 = s->t3; state->reset = s->reset; ff_jpegls_reset_coding_parameters(state, 0); + + /* Testing parameters here, we cannot test in LSE or SOF because + * these interdepend and are allowed in either order + */ + if (state->maxval >= (1<bpp) || + state->T1 > state->T2 || + state->T2 > state->T3 || + state->T3 > state->maxval || + state->reset > FFMAX(255, state->maxval)) { + ret = AVERROR_INVALIDDATA; + goto end; + } + ff_jpegls_init_state(state); if (s->bits <= 8)