x86/platform/uv: Remove spaces from OEM IDs

mike-travis · KAGA-KOKO · commit 1aee505e0171 · 2020-11-07T11:17:39.000+01:00
Testing shows that trailing spaces caused problems with the OEM_ID and the OEM_TABLE_ID. One being that the OEM_ID would not string compare correctly. Another the OEM_ID and OEM_TABLE_ID would be concatenated in the printout. Remove any trailing spaces. Fixes: 1e61f5a ("Add and decode Arch Type in UVsystab") Signed-off-by: Mike Travis <mike.travis@hpe.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20201105222741.157029-3-mike.travis@hpe.com
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -290,6 +290,9 @@ static void __init uv_stringify(int len, char *to, char *from)
 {
 	/* Relies on 'to' being NULL chars so result will be NULL terminated */
 	strncpy(to, from, len-1);
+
+	/* Trim trailing spaces */
+	(void)strim(to);
 }
 
 /* Find UV arch type entry in UVsystab */

Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,9 @@ static void __init uv_stringify(int len, char to, char from)`
`290`	`290`	`{`
`291`	`291`	`/* Relies on 'to' being NULL chars so result will be NULL terminated */`
`292`	`292`	`strncpy(to, from, len-1);`
	`293`	`+`
	`294`	`+ /* Trim trailing spaces */`
	`295`	`+ (void)strim(to);`
`293`	`296`	`}`
`294`	`297`
`295`	`298`	`/* Find UV arch type entry in UVsystab */`