From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A93D3B9D91; Fri, 15 May 2026 16:13:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861640; cv=none; b=KPaSkiOd0uobPljseJ3JsTQLayBXBxtca3eFjvcMRjXJKQMQiuuqVaTooWsoFHMEB2y/yRYK4lkZlAibo6q1IANXk+TSb8XfFjVTllnt21jJ4r42gH3jcIYsx0Efgg2xTPrSFdZpKMmv7e+muGO3DeTnhNGou0LtvSjSZpZf2K4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861640; c=relaxed/simple; bh=/lcsMkZ9hYznA72voWHdZ0LxjTYeXhgYhRtfaedoWfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=is+8AcZDT76QuLrPftgmAlxOD0+WEqkDOKojw4mBQENg4U5iKIaIgDDwNuqDaVxs9fqwq2TrfrCSwIBusqhiNS+RZIUt/JigLpRHcJixU/9Qi7FWEY5X02kqMS1TTvv1kcdPqqfQd9mh9kQxFHQ+D4CBGOMJlA3Zqp6XQYLnng8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1GGo5hil; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1GGo5hil" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7F87DC2BCB0; Fri, 15 May 2026 16:13:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778861639; bh=/lcsMkZ9hYznA72voWHdZ0LxjTYeXhgYhRtfaedoWfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1GGo5hilUEpUMx0QtnNyicHcTM6WTPMX+aXib2Wb3/stKw9sd9vzh5266bk17pY4+ 2ohTTIkcGP6FzHM80zOBNQdPJKHIQY8zMl7rY3DA9UiBW7NVkF3MwT7eOrxmvMmz0z Fw/l82Po7B+++yBDqvNOT1o2mybOmyvZhgPl0Gvc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuhao Jiang , Junrui Luo , Gao Xiang , Sasha Levin Subject: [PATCH 6.6 406/474] erofs: fix unsigned underflow in z_erofs_lz4_handle_overlap() Date: Fri, 15 May 2026 17:48:35 +0200 Message-ID: <20260515154723.836467849@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154715.053014143@linuxfoundation.org> References: <20260515154715.053014143@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Junrui Luo [ Upstream commit 21e161de2dc660b1bb70ef5b156ab8e6e1cca3ab ] Some crafted images can have illegal (!partial_decoding && m_llen < m_plen) extents, and the LZ4 inplace decompression path can be wrongly hit, but it cannot handle (outpages < inpages) properly: "outpages - inpages" wraps to a large value and the subsequent rq->out[] access reads past the decompressed_pages array. However, such crafted cases can correctly result in a corruption report in the normal LZ4 non-inplace path. Let's add an additional check to fix this for backporting. Reproducible image (base64-encoded gzipped blob): H4sIAJGR12kCA+3SPUoDQRgG4MkmkkZk8QRbRFIIi9hbpEjrHQI5ghfwCN5BLCzTGtLbBI+g dilSJo1CnIm7GEXFxhT6PDDwfrs73/ywIQD/1ePD4r7Ou6ETsrq4mu7XcWfj++Pb58nJU/9i PNtbjhan04/9GtX4qVYc814WDqt6FaX5s+ZwXXeq52lndT6IuVvlblytLMvh4Gzwaf90nsvz 2DF/21+20T/ldgp5s1jXRaN4t/8izsy/OUB6e/Qa79r+JwAAAAAAAL52vQVuGQAAAP6+my1w ywAAAAAAAADwu14ATsEYtgBQAAA= $ mount -t erofs -o cache_strategy=disabled foo.erofs /mnt $ dd if=/mnt/data of=/dev/null bs=4096 count=1 Fixes: 598162d05080 ("erofs: support decompress big pcluster for lz4 backend") Reported-by: Yuhao Jiang Cc: stable@vger.kernel.org Signed-off-by: Junrui Luo Reviewed-by: Gao Xiang Signed-off-by: Gao Xiang [ inverted condition to early-out `goto docopy` form and used `ctx->inpages`/`ctx->outpages` instead of `rq->` ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/erofs/decompressor.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/erofs/decompressor.c +++ b/fs/erofs/decompressor.c @@ -133,6 +133,7 @@ static void *z_erofs_lz4_handle_overlap( if (rq->inplace_io) { omargin = PAGE_ALIGN(ctx->oend) - ctx->oend; if (rq->partial_decoding || !may_inplace || + ctx->outpages < ctx->inpages || omargin < LZ4_DECOMPRESS_INPLACE_MARGIN(rq->inputsize)) goto docopy;