diff --git a/kpatch-build/create-diff-object.c b/kpatch-build/create-diff-object.c
index 2636524..e332ba2 100644
--- a/kpatch-build/create-diff-object.c
+++ b/kpatch-build/create-diff-object.c
@@ -911,6 +911,8 @@ do {								\
 		log_debug("renaming %s %s to %s\n",		\
 			  kindstr, e2->name, e1->name);		\
 		e2->name = strdup(e1->name);			\
+		if (!e2->name)				        \
+			ERROR("strdup");			\
 	}							\
 } while (0)
 
@@ -3461,6 +3463,8 @@ static void kpatch_create_mcount_sections(struct kpatch_elf *kelf)
 
 			/* Make a writable copy of the text section data */
 			newdata = malloc(sym->sec->data->d_size);
+			if (!newdata)
+				ERROR("malloc");
 			memcpy(newdata, sym->sec->data->d_buf, sym->sec->data->d_size);
 			sym->sec->data->d_buf = newdata;
 			insn = newdata;
diff --git a/kpatch-build/create-klp-module.c b/kpatch-build/create-klp-module.c
index d1b03fe..c036b94 100644
--- a/kpatch-build/create-klp-module.c
+++ b/kpatch-build/create-klp-module.c
@@ -326,6 +326,8 @@ static void create_klp_arch_sections(struct kpatch_elf *kelf, char *strings)
 
 		new_size = old_size + base->data->d_size;
 		sec->data->d_buf = realloc(sec->data->d_buf, new_size);
+		if (!sec->data->d_buf)
+			ERROR("realloc");
 		sec->data->d_size = new_size;
 		sec->sh.sh_size = sec->data->d_size;
 		memcpy(sec->data->d_buf + old_size,