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 37ECE46C4C4; Tue, 21 Jul 2026 19:01:50 +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=1784660512; cv=none; b=gRqH+RjZrmLnVJrnGp8hHmJn7R337iFHgN7elGIE0Dk/3MWJVUL86VnOyKWao7YRjU4wUdyKKSlye0EFt7hXj0Qy0yFLCdU2cD5BiWHaCeR4l0poFDzr9MpHFu+xh+iD5U5B01cKKsHh1tgcY/0tKxNhVr9AgZR2JylQ70Ks2PU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784660512; c=relaxed/simple; bh=otx02YAzM7iMnHrQmwHZnZsFaN2dzPPWgRj4PdXvb10=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sP2TGlUEGaZuIawfB938U9l5CieuRgiDmW4OObLi+xplG60XPCvsa3V0mwJJ4+DJBgqF/jUkk8TqnEK1t/wgUHONmInS+E7xgyJNWLc8xFj0rdsTZUBpEovydwW6ObU90K0jUt7yM6B4W63OIAWgkLjTOo288JFKYC+oT+uUtlU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Iuqd/Kp6; 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="Iuqd/Kp6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B2A21F000E9; Tue, 21 Jul 2026 19:01:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784660510; bh=6r8aruyqaWcDWuubKcRt17WWHdGiAviZuodPWHGswGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Iuqd/Kp6tHZkeFbvowtYyLIJw5a2UAiJ6rT/GuMZ6SlATXYJixyarnbESo4baJdZX 705Iy2fTg0/QDPOZzfrCNBcoR7e4seSxBXd1e72KElMvKQvPdCcN960Yz+UMzIu5/N VCd509FMIj5yHS5N5w9pucGAneAeXOv+wAEd5IKA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, sashiko-bot , Stephane Eranian , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 7.1 1005/2077] perf pmu: Fix perf_pmu__parse_scale/unit() OOB access on empty sysfs file Date: Tue, 21 Jul 2026 17:11:18 +0200 Message-ID: <20260721152616.521816101@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152552.646164743@linuxfoundation.org> References: <20260721152552.646164743@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 7.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo [ Upstream commit 33035f7dd4e49f3f117e70c5e36c8c1ae88d37f2 ] perf_pmu__parse_scale() reads a PMU scale file then accesses scale[sret - 1] to strip a trailing newline. Only sret < 0 is guarded, so an empty file (sret == 0) causes scale[-1] — a stack buffer underflow that reads and potentially writes out of bounds. perf_pmu__parse_unit() has the same pattern: alias->unit[sret - 1] with sret == 0 accesses the byte before the struct member, which may corrupt the adjacent pmu_name pointer field. Change both guards from sret < 0 to sret <= 0 so that empty files are treated as read errors. Fixes: 410136f5dd96b601 ("tools/perf/stat: Add event unit and scale support") Reported-by: sashiko-bot Cc: Stephane Eranian Assisted-by: Claude:claude-opus-4.6 Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index dc12e39ceb5fc8..64544e1e6810f3 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -314,7 +314,7 @@ static int perf_pmu__parse_scale(struct perf_pmu *pmu, struct perf_pmu_alias *al goto error; sret = read(fd, scale, sizeof(scale)-1); - if (sret < 0) + if (sret <= 0) goto error; if (scale[sret - 1] == '\n') @@ -346,7 +346,7 @@ static int perf_pmu__parse_unit(struct perf_pmu *pmu, struct perf_pmu_alias *ali return -1; sret = read(fd, alias->unit, UNIT_MAX_LEN); - if (sret < 0) + if (sret <= 0) goto error; close(fd); -- 2.53.0