From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9EC0F44C64 for ; Fri, 13 Oct 2023 01:50:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E83A68C91D; Fri, 13 Oct 2023 04:50:10 +0300 (EEST) Received: from mail-qt1-f170.google.com (mail-qt1-f170.google.com [209.85.160.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF4C968C79E for ; Fri, 13 Oct 2023 04:50:03 +0300 (EEST) Received: by mail-qt1-f170.google.com with SMTP id d75a77b69052e-419bbf3dcb1so2656891cf.0 for ; Thu, 12 Oct 2023 18:50:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697161802; x=1697766602; 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=WNUB9BISyNEkr8fXaYdXXf8d/3xbUFvqqY1PgboW7cM=; b=MSuk2EfIKAhj2mxLfPN8Ni5Ltv4Es+CrcRcX2FzxQe81+Mmsgte66If1KFbSgeewZD puEEATrpWOGwbNqWWneXyqP4pt5l5T+LgGnED7Ua6waE7kAELj8AyWNrNu++lkgY06HW OSw+ZhzZKFZ1twOEBzXwBKffJl0LaBqaeTWfZKyCEEO0J4Kd3uqsqZfssfNAZtDpny61 +QW2G2cG2NkOAdyScLRF57YtOXvkMb1kBhK3LeYAnnVwSwsNNs6cqm7Hlu4fpvsMA7Zn vIlPRqu5NfT/lEsPn0hUR2qnBK9daIVQ7UpfegPRxn348zM3YAa9N3Dmw6jYjQDtUvBn 93GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697161802; x=1697766602; 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=WNUB9BISyNEkr8fXaYdXXf8d/3xbUFvqqY1PgboW7cM=; b=CC+V7G/fmamQEfz3rjIDJEVJlp2EVUoPLVESv9R7Ukf0RnQcs8Aa/cWsEL3+tfZ9Dj 1XXjqvKTGBYtr7m+2Z2fXBKuwtTOLgZpNfcKkvPmYW6eRmYzryWJPad3qjPip1V1Yb/Y YAJ4QRw0R8iAQcXF0kmd22oGSCFRmCTVKEz/9vSHbPvDzjoQlzMYyNxeo32tCpSR7mrU 6ZsHZNnSn8kufJ9v+cKplGyM1uAvTt1P/N7lt+0xr9feqgtj1ToT1PludrqcPEUZ7Luk VzFwCMy7Sl1gQi0FdEMsXglklBnail1VhzC/spe0QP54Vn+zUJ8YO2FOLTuiubWdvTm5 Iu/w== X-Gm-Message-State: AOJu0Yx5OdfoUwl570vor6qLgmhEo+BU6/AnVRRSXB6UiRI6hjYdBMKF IUH3PKZrgQRyETzD3OcgOhJk+1/p8JpLrg== X-Google-Smtp-Source: AGHT+IFU2pM28dTLaIUV5mbG6Je55iA8TQvmBCYpgfBYt4CBDC4qSnBcXEd26MI+YxCAJ2AWvTHK2A== X-Received: by 2002:ac8:5a05:0:b0:412:2dd3:e0ed with SMTP id n5-20020ac85a05000000b004122dd3e0edmr31288229qta.0.1697161802438; Thu, 12 Oct 2023 18:50:02 -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 h4-20020ac87444000000b004179e79069asm233967qtr.21.2023.10.12.18.50.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Oct 2023 18:50:02 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Oct 2023 21:49:59 -0400 Message-ID: <20231013014959.536776-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/jpegxl_parser: fix OOB read regression 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: Cole Dilorenzo , Leo Izen Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: In f7ac3512f5b5cb8eb149f37300b43461d8e93af3 the size of the dynamically allocated buffer was shrunk, but it was made too small for very small alphabet sizes. This patch sets a minimum size to prevent an OOB read. Reported-by: Cole Dilorenzo Signed-off-by: Leo Izen --- libavcodec/jpegxl_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpegxl_parser.c b/libavcodec/jpegxl_parser.c index dde36b0d6e..e00e01e82b 100644 --- a/libavcodec/jpegxl_parser.c +++ b/libavcodec/jpegxl_parser.c @@ -726,8 +726,8 @@ static int read_vlc_prefix(GetBitContext *gb, JXLEntropyDecoder *dec, JXLSymbolD if (ret < 0) goto end; - buf = av_mallocz(dist->alphabet_size * (2 * sizeof(int8_t) + sizeof(int16_t) + sizeof(uint32_t)) - + sizeof(uint32_t)); + buf = av_mallocz(dist->alphabet_size * (2 * sizeof(int8_t) + sizeof(int16_t)) + + FFMAX(15, dist->alphabet_size + 1) * sizeof(uint32_t)); if (!buf) { ret = AVERROR(ENOMEM); goto end; -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".