diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index 850d5a9497e3..6ae333021af2 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -742,7 +742,7 @@ const char *__bpf_address_lookup(unsigned long addr, unsigned long *size,
 		unsigned long symbol_start = ksym->start;
 		unsigned long symbol_end = ksym->end;
 
-		strncpy(sym, ksym->name, KSYM_NAME_LEN);
+		strscpy(sym, ksym->name, KSYM_NAME_LEN);
 
 		ret = sym;
 		if (size)
@@ -808,7 +808,7 @@ int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type,
 		if (it++ != symnum)
 			continue;
 
-		strncpy(sym, ksym->name, KSYM_NAME_LEN);
+		strscpy(sym, ksym->name, KSYM_NAME_LEN);
 
 		*value = ksym->start;
 		*type  = BPF_SYM_ELF_TYPE;
diff --git a/kernel/bpf/log.c b/kernel/bpf/log.c
index 594a234f122b..0947a548dc9f 100644
--- a/kernel/bpf/log.c
+++ b/kernel/bpf/log.c
@@ -424,9 +424,9 @@ const char *reg_type_str(struct bpf_verifier_env *env, enum bpf_reg_type type)
 
 	if (type & PTR_MAYBE_NULL) {
 		if (base_type(type) == PTR_TO_BTF_ID)
-			strncpy(postfix, "or_null_", 16);
+			strscpy(postfix, "or_null_", 16);
 		else
-			strncpy(postfix, "_or_null", 16);
+			strscpy(postfix, "_or_null", 16);
 	}
 
 	snprintf(prefix, sizeof(prefix), "%s%s%s%s%s%s%s",