From 01979850ed9c35cc0668890d7407f4bd7a505f37 Mon Sep 17 00:00:00 2001 From: chaac Date: Mon, 14 Apr 2008 19:39:04 +0000 Subject: [PATCH] 2008-04-14 Vesa Jaaskelainen * disk/lvm.c (grub_lvm_scan_device): Add forgotten failure path when there is no memory left for physical volume name. --- ChangeLog | 5 +++++ disk/lvm.c | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 10b22099b..09c3294b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-04-14 Vesa Jaaskelainen + + * disk/lvm.c (grub_lvm_scan_device): Add forgotten failure path when + there is no memory left for physical volume name. + 2008-04-14 Vesa Jaaskelainen * disk/lvm.c (grub_lvm_scan_device): Fix logical volume's physical diff --git a/disk/lvm.c b/disk/lvm.c index 7af01e2bb..fe49209e3 100644 --- a/disk/lvm.c +++ b/disk/lvm.c @@ -477,7 +477,11 @@ grub_lvm_scan_device (const char *name) q++; s = q - p; + pvname = grub_malloc (s + 1); + if (pvname == NULL) + goto lvs_segment_fail2; + grub_memcpy (pvname, p, s); pvname[s] = '\0';