Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 65D773DD51A; Sat, 12 Sep 2026 11:08:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789211312; cv=none; b=sDS4lt4tHJ3UI0FAIXeswyVZYC4f7kpDjAe6ZNPDlN1GDTbrM0dVAYskFTIrTCvVoKFGN+4YtSConb4DvvymOq55DjdeM0E/dTiQOZEKwqMTbKljxZnyoAYylrJpTajAtF7x0ESzT9+SGEIS/EX0MbqA7WPN4RtivNRAVRLA1Ww= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789211312; c=relaxed/simple; bh=QI265Ci95xt+M/xFaDzL9CrE0ThHBUzcKm0Qo2XZrBs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JfNPf8QgxA6wICYM7Kl3o+SmE4fcAAxetz2NySOIswEX34Xw19sCOYr10T6JyO+S6rULidwTXQlLddsHhc051fB1xRknp/XcmCCu56LT+eTSzWuHcs/OBKGRqUGjGJAziOkUqD61PV9VN5FfG6+gXnoUnjxnr67EGoGzwKA7ErI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HLaSDNwB; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HLaSDNwB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6A3BF1F000FF; Sat, 12 Sep 2026 11:08:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789211311; bh=bu6D9zL1JDR6ZGC4Uf+ariDFHODUrUuThoSgI8Tzo7Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HLaSDNwBWkkcnyHFtUiKMaJ5BFXbCV9FXwonmm32CsjKSb2pGOLR0pDdYMhV6+Was ydWshfUljfbp6lTueda1XUAdeOwjRc7VWWyOjt2qv7pvWniTphqBICrO3HyIr06FIh Vh8alAQ0qzRIQT31sKTvzPgfubOuPa4gim7DsgIY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot , Ian Rogers , Arnaldo Carvalho de Melo , Namhyung Kim , Sasha Levin Subject: [PATCH 6.18 1206/1518] perf dso: Guard against cache underflow on short reads in dso_cache__memcpy() Date: Sat, 12 Sep 2026 08:56:15 +0200 Message-ID: <20260912065650.770627607@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065623.398859879@linuxfoundation.org> References: <20260912065623.398859879@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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo [ Upstream commit 390a9461cd73bdd13acc0f6d763618ae1ff8fa17 ] dso_cache__memcpy() computes cache_offset = offset - cache->offset, then cache_size = min(cache->size - cache_offset, size). The RB tree lookup in __dso_cache__find() matches using the full DSO__DATA_CACHE_SIZE window, but cache->size reflects the actual pread return value from dso_cache__populate(). A short pread (e.g. near end-of-file) makes cache->size smaller than DSO__DATA_CACHE_SIZE. If a subsequent access targets an offset past cache->offset + cache->size but within the DSO__DATA_CACHE_SIZE window, the cache entry is found but cache_offset exceeds cache->size. Since both are u64, the subtraction cache->size - cache_offset wraps to a large value, min() selects the caller's size, and memcpy reads out of bounds. Return 0 for an offset past the valid cached data. For a regular file a short pread only happens at end-of-file, so 0 is what a direct pread() at that offset would return: cached_io() stops its read loop as on EOF. Re-reading from the backing file would not help — a second pread at the same offset returns the same short count. Fixes: 366df72657e0 ("perf dso: Refactor dso_cache__read()") Reported-by: sashiko-bot Reviewed-by: Ian Rogers Assisted-by: Claude:claude-opus-4.6 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Namhyung Kim Signed-off-by: Sasha Levin --- tools/perf/util/dso.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index c58c3b345debe..7df9a88c24e04 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -1013,7 +1013,20 @@ static ssize_t dso_cache__memcpy(struct dso_cache *cache, u64 offset, u8 *data, u64 size, bool out) { u64 cache_offset = offset - cache->offset; - u64 cache_size = min(cache->size - cache_offset, size); + u64 cache_size; + + /* + * The RB tree matches using DSO__DATA_CACHE_SIZE, but a short + * pread may leave cache->size smaller. For a regular file a + * short pread only happens at end-of-file, so an offset past + * the valid data is EOF: return 0, matching what a direct + * pread() at that offset would return, and cached_io() then + * stops its read loop. + */ + if (cache_offset >= cache->size) + return 0; + + cache_size = min(cache->size - cache_offset, size); if (out) memcpy(data, cache->data + cache_offset, cache_size); -- 2.53.0