vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

loader/bsd: fix memory leak

Browse source 
Found by: Coverity scan.
CID: 96686
This commit is contained in:
Andrei Borzenkov 2015-06-20 23:38:18 +03:00
parent a6f7d1abce
commit 20211c0077
1 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
grub-core/loader/i386/bsdXX.c
View file

@ -417,7 +417,10 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
err = read_headers (file, filename, &e, &shdr); err = read_headers (file, filename, &e, &shdr);
if (err) if (err)
return err; {
grub_free (shdr);
return grub_errno;
}
for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) (shdr for (s = (Elf_Shdr *) shdr; s < (Elf_Shdr *) (shdr
+ e.e_shnum * e.e_shentsize); + e.e_shnum * e.e_shentsize);
@ -426,7 +429,10 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
break; break;
if (s >= (Elf_Shdr *) ((char *) shdr if (s >= (Elf_Shdr *) ((char *) shdr
+ e.e_shnum * e.e_shentsize)) + e.e_shnum * e.e_shentsize))
{
grub_free (shdr);
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
}
symsize = s->sh_size; symsize = s->sh_size;
symsh = s; symsh = s;
s = (Elf_Shdr *) (shdr + e.e_shentsize * s->sh_link); s = (Elf_Shdr *) (shdr + e.e_shentsize * s->sh_link);
@ -443,7 +449,7 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
err = grub_relocator_alloc_chunk_addr (relocator, &ch, err = grub_relocator_alloc_chunk_addr (relocator, &ch,
symtarget, chunk_size); symtarget, chunk_size);
if (err) if (err)
return err; goto out;
sym_chunk = get_virtual_current_address (ch); sym_chunk = get_virtual_current_address (ch);
} }
@ -482,29 +488,41 @@ SUFFIX (grub_netbsd_load_elf_meta) (struct grub_relocator *relocator,
} }
if (grub_file_seek (file, symsh->sh_offset) == (grub_off_t) -1) if (grub_file_seek (file, symsh->sh_offset) == (grub_off_t) -1)
return grub_errno; {
err = grub_errno;
goto out;
}
if (grub_file_read (file, curload, symsize) != (grub_ssize_t) symsize) if (grub_file_read (file, curload, symsize) != (grub_ssize_t) symsize)
{ {
if (! grub_errno) if (! grub_errno)
return grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), err = grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
filename); filename);
return grub_errno; else
err = grub_errno;
goto out;
} }
curload += ALIGN_UP (symsize, sizeof (grub_freebsd_addr_t)); curload += ALIGN_UP (symsize, sizeof (grub_freebsd_addr_t));
if (grub_file_seek (file, strsh->sh_offset) == (grub_off_t) -1) if (grub_file_seek (file, strsh->sh_offset) == (grub_off_t) -1)
return grub_errno; {
err = grub_errno;
goto out;
}
if (grub_file_read (file, curload, strsize) != (grub_ssize_t) strsize) if (grub_file_read (file, curload, strsize) != (grub_ssize_t) strsize)
{ {
if (! grub_errno) if (! grub_errno)
return grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), err = grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
filename); filename);
return grub_errno; else
err = grub_errno;
goto out;
} }
err = grub_bsd_add_meta (NETBSD_BTINFO_SYMTAB, err = grub_bsd_add_meta (NETBSD_BTINFO_SYMTAB,
&symtab, &symtab,
sizeof (symtab)); sizeof (symtab));
out:
grub_free (shdr);
if (err) if (err)
return err; return err;