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

grub-core/loader/i386/xen_fileXX.c: memory leak in grub_xen_get_infoXX

Browse source 
CID: 73645, 73782
This commit is contained in:
Andrei Borzenkov 2014-12-01 21:23:54 +03:00
parent 03d79a878b
commit 3173c7501c
2 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2014-12-01 Andrei Borzenkov <arvidjaar@gmail.com> 2014-12-01 Andrei Borzenkov <arvidjaar@gmail.com>
* grub-core/loader/i386/xen_fileXX.c (grub_xen_get_infoXX): Fix
memory leak (CID 73645, 73782).
* grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Fix memory leak * grub-core/fs/zfs/zfsinfo.c (print_vdev_info): Fix memory leak
(CID 73635). (CID 73635).

30
grub-core/loader/i386/xen_fileXX.c
View file

@ -311,14 +311,19 @@ grub_xen_get_infoXX (grub_elf_t elf, struct grub_xen_file_info *xi)
return grub_errno; return grub_errno;
if (grub_file_seek (elf->file, elf->ehdr.ehdrXX.e_shoff) == (grub_off_t) -1) if (grub_file_seek (elf->file, elf->ehdr.ehdrXX.e_shoff) == (grub_off_t) -1)
return grub_errno; {
err = grub_errno;
goto cleanup;
}
if (grub_file_read (elf->file, s0, shsize) != (grub_ssize_t) shsize) if (grub_file_read (elf->file, s0, shsize) != (grub_ssize_t) shsize)
{ {
if (grub_errno) if (grub_errno)
return grub_errno; err = grub_errno;
return grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"), else
err = grub_error (GRUB_ERR_BAD_OS, N_("premature end of file %s"),
elf->file->name); elf->file->name);
goto cleanup;
} }
s = (Elf_Shdr *) ((char *) s0 + elf->ehdr.ehdrXX.e_shstrndx * shentsize); s = (Elf_Shdr *) ((char *) s0 + elf->ehdr.ehdrXX.e_shstrndx * shentsize);
@ -330,18 +335,29 @@ grub_xen_get_infoXX (grub_elf_t elf, struct grub_xen_file_info *xi)
char name[sizeof("__xen_guest")]; char name[sizeof("__xen_guest")];
grub_memset (name, 0, sizeof (name)); grub_memset (name, 0, sizeof (name));
if (grub_file_seek (elf->file, stroff + s->sh_name) == (grub_off_t) -1) if (grub_file_seek (elf->file, stroff + s->sh_name) == (grub_off_t) -1)
return grub_errno; {
err = grub_errno;
goto cleanup;
}
if (grub_file_read (elf->file, name, sizeof (name)) != (grub_ssize_t) sizeof (name)) if (grub_file_read (elf->file, name, sizeof (name)) != (grub_ssize_t) sizeof (name))
{ {
if (grub_errno) if (grub_errno)
return grub_errno; {
err = grub_errno;
goto cleanup;
}
continue; continue;
} }
if (grub_memcmp (name, "__xen_guest", if (grub_memcmp (name, "__xen_guest",
sizeof("__xen_guest")) != 0) sizeof("__xen_guest")) != 0)
continue; continue;
return parse_xen_guest (elf, xi, s->sh_offset, s->sh_size); err = parse_xen_guest (elf, xi, s->sh_offset, s->sh_size);
goto cleanup;
} }
return grub_error (GRUB_ERR_BAD_OS, "no XEN note found"); err = grub_error (GRUB_ERR_BAD_OS, "no XEN note found");
cleanup:
grub_free (s0);
return err;
} }