From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Date: Sat, 8 Feb 2025 10:55:42 +0000 (+0200)
Subject: tools/power turbostat: Fix names matching
X-Git-Tag: v6.15-rc1~2^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5132681dcd96b2a8c357b6e5d93e9876924bb80b;p=thirdparty%2Fkernel%2Flinux.git

tools/power turbostat: Fix names matching

Fix the 'find_msrp_by_name()' function which returns incorrect matches for
cases like this:

s1 = "C1-";
find_msrp_by_name(head, s1);

Inside 'find_msrp_by_name()':
...
s2 = "C1"
if !(strcnmp(s1, s2, len(s2)))
	// Incorrect match!
	return mp;

Full strings should be match istead. Switch to 'strcmp()' to fix the problem.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
---

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index d26008f37a2c0..d3af2bf307e17 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -9612,7 +9612,7 @@ struct msr_counter *find_msrp_by_name(struct msr_counter *head, char *name)
 	for (mp = head; mp; mp = mp->next) {
 		if (debug)
 			fprintf(stderr, "%s: %s %s\n", __func__, name, mp->name);
-		if (!strncmp(name, mp->name, strlen(mp->name)))
+		if (!strcmp(name, mp->name))
 			return mp;
 	}
 	return NULL;