diff --git a/src/topology.c b/src/topology.c
index a884e41c67..e5fb85e406 100644
--- a/src/topology.c
+++ b/src/topology.c
@@ -888,13 +888,10 @@ static HSAKMT_STATUS topology_parse_cpuinfo(struct proc_cpuinfo *cpuinfo,
 		if (!strncmp("model name", read_buf, sizeof("model name") - 1)) {
 			p = strchr(read_buf, ':');
 			p += 2; /* remove ": " */
-			p_len = strlen(p);
-			if (p_len < HSA_PUBLIC_NAME_SIZE) {
-				/* -1 to remove \n from p */
-				strncpy(cpuinfo[proc].model_name, p, p_len - 1);
-				cpuinfo[proc].model_name[p_len - 1] = '\0';
-			} else
-				strncpy(cpuinfo[proc].model_name, p, HSA_PUBLIC_NAME_SIZE);
+			p_len = (strlen(p) > HSA_PUBLIC_NAME_SIZE ?
+					HSA_PUBLIC_NAME_SIZE : strlen(p));
+			memcpy(cpuinfo[proc].model_name, p, p_len);
+			cpuinfo[proc].model_name[p_len - 1] = '\0';
 			continue;
 		}