diff --git a/ChangeLog b/ChangeLog
index 39bb8279b..598d16cc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/dl.c (grub_dl_resolve_symbols): Handle malloc failure.
+
 2013-04-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Move mips-arc link address. Previous link address was chosen
diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
index d06b6aef2..c6d9ec982 100644
--- a/grub-core/kern/dl.c
+++ b/grub-core/kern/dl.c
@@ -359,6 +359,8 @@ grub_dl_resolve_symbols (grub_dl_t mod, Elf_Ehdr *e)
 
 #ifdef GRUB_MODULES_MACHINE_READONLY
   mod->symtab = grub_malloc (s->sh_size);
+  if (!mod->symtab)
+    return grub_errno;
   memcpy (mod->symtab, (char *) e + s->sh_offset, s->sh_size);
 #else
   mod->symtab = (Elf_Sym *) ((char *) e + s->sh_offset);