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 BA11D3328FC; Sat, 12 Sep 2026 15:10:35 +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=1789225839; cv=none; b=XiwaXpKlZmskm65wNwug4ziSjov+J6O9cACpBEFUrjkTHxuMx7Y68CrOZpJLAgRaelWV+LqdcomEq9CG/y4YXr8pHqUiqABDcsn6k7SemFbqkyKfuMZM/8rwbLzynlFZ0sbZUPp59lyIi3B3wBI/y5SBp5THppwuuR7ybrpE4/U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789225839; c=relaxed/simple; bh=xKOSYZHjBUPk0+qCUR3dBVrPtj+3SfYUSVvQQ+rRxsg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=przjLlNx8sR6McqgdSzT/hZZn5VcVGnoR8gk5ZXr7tJyb4U5sTHTySI6GhVlxEUpmS7eYvNRe6dIBjZIwGhEJc3h3NcDjl/XNgy/ybxUbOCjSCGaOphJdqoxdRKsJiJeACbd06x3Cl2TcBIgqp0Gg/CX4/ajMhXXfv7T2sKAJSQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Vl+TCeI5; 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="Vl+TCeI5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A4751F000FF; Sat, 12 Sep 2026 15:10:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789225834; bh=USJCXD3sVeKxi3jk6+Ej6qRYvhPs6uc2VyXpbBGBDWs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Vl+TCeI5mgp23ZVx1xbMyyPBOiH9SYIbJEDRtcN1M8AZx+n0nsmncQ+cOwBpbSjvv 20lPkmjLJ+s+aKDv4IfO3LMmtmtQiFFuG1OLYlUfeJySzgnnydyYueaF6GMwQEv/5Y vqUGuD2BQtlbM76aOn7llWgXkCstT/sXYvMnatZs= 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.6 1226/1424] perf dso: Guard against cache underflow on short reads in dso_cache__memcpy() Date: Sat, 12 Sep 2026 09:00:58 +0200 Message-ID: <20260912065634.738706229@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065607.279695368@linuxfoundation.org> References: <20260912065607.279695368@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.6-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 49af48a5deddd..0e71bfffd4aca 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -915,7 +915,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