From patchwork Tue Oct 3 17:38:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 44132 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f21:b0:15d:8365:d4b8 with SMTP id gi33csp551pzb; Tue, 3 Oct 2023 10:39:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGLOcriou2T4PgsrPlj5ztaMmMAmzQ7ZiSj6AkqY96qwSbw+YB3jvdfnQ3nDsGkg9VyKOXK X-Received: by 2002:a17:907:80d:b0:9a4:11a3:c32b with SMTP id wv13-20020a170907080d00b009a411a3c32bmr2953222ejb.29.1696354743030; Tue, 03 Oct 2023 10:39:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696354743; cv=none; d=google.com; s=arc-20160816; b=CNT2G2v8txXXvksXwl4ey1Q74pcU+cjJ+seECDns6rsDiu7jujXGsBep5GGzqANe1/ dxw45Gf7rFEJYVLu4Kzec65MVkCNXoUTWBovwkdPCxml8QfRm5GXLa3rTe7xC72B7kpG BD4H6kio8TP7hm9KfSCDZj+8g6Srd9tPO/++z7Lx9tfBGUco9mjgG2ldguAesKqeI3A4 gQtxu1ZFM1wihuxn9Ub7yoY7G9wKQoQVDnFhiuAqj3A/rUdEAlAhRdpWH639Wcx4rU0R CJxfS9liNmiDo+6zdoYivB4kE2mZjqfbsutnO3RSZJINlmx1W3HgmbeBHUQHGao5Ga5E Uang== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=Y0y3XwwmIbYDpPS1FntSc0nkv8r8aehdyYZOAlLAl6A=; fh=FYzOVThyl/FlqQ7uXyPgiZ3IBa6Cm47bzOUzHuMA/IA=; b=0HhOnmq4dVeYcPuvDttFDuBGHJTDv7sbO2rWRJqUKWDD0nxVS1jvUER0UBkBEJLU/0 Hd9J/zRtlYXCu1FRwZwkUkuKXzQTnyQz5LwFBPy+KNUCjUv/AH1jKqr9YOXlgz9rLBzA M7LSM5SQPEsn+KhsA9X0OAHPWN/mna+ybEQy4ZcvI3qrfYVK0No83I+BpLGMY8rVdNb+ 8ySU6VHQf9BiRwLs0Cr9khPBRjiD8XpNhE6oyYuNqE9tmM7e4nC69dmvOLBZMpDR9ycq /b78a+D3lr7wQ2VVQr8PMR6+dA8ib8zVFgtaY9J013Cskhbt3otdOx0NjLcLl/Xh5k7M bH9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XEEMFQ0H; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 17-20020a170906059100b009ae6afca755si872217ejn.652.2023.10.03.10.38.45; Tue, 03 Oct 2023 10:39:03 -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=@gmail.com header.s=20230601 header.b=XEEMFQ0H; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9DF0D68CA8F; Tue, 3 Oct 2023 20:38:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4FDD968CA8F for ; Tue, 3 Oct 2023 20:38:30 +0300 (EEST) Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-4180a14a6a7so1299271cf.1 for ; Tue, 03 Oct 2023 10:38:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696354708; x=1696959508; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=dfKKA7SN6f1mEYKKvMaaqRwaXGrhJY+wqFaJE1c8ImA=; b=XEEMFQ0HlbDH+DBS/n2ikE9cNAO46zMRE/OTcLYE1BRQkr4wYpCXfRCaDRgYEmHuPl TcLlvwpqR10ZOnFfKqUBuQ5UrVtsxZ7OZbwFZ31rW7r/doryKpZBMSe5chaYGrqa0W7j SXis3bL4pb8DZAvewPyf6q4sjyEtRn0SagyJOJEqyNF0tnjEjIMSgFB41YsSszEWEZRl 4DhNaY+/9SGLXQjTxCWFzNLf/2MV/wDa4qN70Z+ipAHyCnA/uLCfXrZsgBXEJDytQ+XN vQqaiYvCl0Q8gZvxkw4R6Rg6B10vkeZg8+Xssq9UerGjNWCuha/6Gnq0Ao4j9B4BCi9H R2Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696354708; x=1696959508; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dfKKA7SN6f1mEYKKvMaaqRwaXGrhJY+wqFaJE1c8ImA=; b=ncR3veZb1rX291LtL1XCOYSnJ8GjAO/S9SgWzkv10KZYpBN8iGUkHqUqALlL3bks3j arvqvZzs4Xngql7pBeCQ+a5seMwLHhhh/wgUGs3RtSeSNUf6m+wgf5Ef+folidQM4kSQ bb6OqIxUh3rjHN5C+cpICf/b+XsOeVL0ge5NkDIYZqfS1ZV1nxXbvosMtAcntdE+VQpy W71U3LYUjn+bQRFVUDJhVkz8ApfSOYi4I3kebaakAcBlr5b6Vt7NPlrkTis+k2+7aoE8 wdBMjFLziFQq9Alh1SiTVWFaP85Z/Zlxa7BWgCBhpVomQL1B+9Emx7aZUKVYpr9TaOcU Q6kA== X-Gm-Message-State: AOJu0YxuEYLlM8ZjYHVljeGntWkQE9g9WFRKRkWhgGZGuqL2hcX7/p3b rncGBgJjtBj0j4vmj1Ylh6i8AKhLdBeeAw== X-Received: by 2002:a05:622a:1a0a:b0:412:d46:a8c3 with SMTP id f10-20020a05622a1a0a00b004120d46a8c3mr150018qtb.2.1696354707637; Tue, 03 Oct 2023 10:38:27 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id t8-20020ac86a08000000b00403cce833eesm603331qtr.27.2023.10.03.10.38.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 10:38:27 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Oct 2023 13:38:25 -0400 Message-ID: <20231003173825.4357-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/jpegxl_parser: add some icc profile checks 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 Cc: Michael Niedermayer , Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 3ReT7rMtfARE This patch will cause the parser to abort if it detects an icc profile with an invalid size. This is particularly important if the icc profile is entropy-encoded with zero bits per symbol, as it can prevent a seemingly infinite loop during parsing. Fixes: infinite loop Fixes: 62374/clusterfuzz-testcase-minimized-ffmpeg_IO_DEMUXER_fuzzer -5551878085410816 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reported-by: Michael Niedermayer Signed-off-by: Leo Izen --- libavcodec/jpegxl_parser.c | 44 ++++++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c index d25a1b6e1d..bbd7338a61 100644 --- a/libavcodec/jpegxl_parser.c +++ b/libavcodec/jpegxl_parser.c @@ -1044,34 +1044,60 @@ static int skip_icc_profile(void *avctx, JXLParseContext *ctx, GetBitContext *gb { int64_t ret; uint32_t last = 0, last2 = 0; - JXLEntropyDecoder dec; + JXLEntropyDecoder dec = { 0 }; uint64_t enc_size = jxl_u64(gb); + uint64_t output_size = 0; + int out_size_shift = 0; - if (!enc_size) + if (!enc_size || enc_size > (1 << 22)) return AVERROR_INVALIDDATA; ret = entropy_decoder_init(avctx, gb, &dec, 41); if (ret < 0) - return ret; + goto end; if (get_bits_left(gb) < 0) { - entropy_decoder_close(&dec); - return AVERROR_BUFFER_TOO_SMALL; + ret = AVERROR_BUFFER_TOO_SMALL; + goto end; } for (uint64_t read = 0; read < enc_size; read++) { ret = entropy_decoder_read_symbol(gb, &dec, icc_context(read, last, last2)); - if (ret < 0 || get_bits_left(gb) < 0) { - entropy_decoder_close(&dec); - return ret < 0 ? ret : AVERROR_BUFFER_TOO_SMALL; + if (ret < 0) + goto end; + if (ret > 255) { + ret = AVERROR_INVALIDDATA; + goto end; + } + if (get_bits_left(gb) < 0) { + ret = AVERROR_BUFFER_TOO_SMALL; + goto end; } last2 = last; last = ret; + if (out_size_shift < 63) { + output_size += (ret & UINT64_C(0x7F)) << out_size_shift; + if (!(ret & 0x80)) { + out_size_shift = 63; + } else { + out_size_shift += 7; + if (out_size_shift > 56) { + ret = AVERROR_INVALIDDATA; + goto end; + } + } + } else if (output_size < 132) { + ret = AVERROR_INVALIDDATA; + goto end; + } } + ret = 0; + +end: entropy_decoder_close(&dec); - return 0; + return ret; } static int skip_extensions(GetBitContext *gb)