Received: from list by lists.gnu.org with archive (Exim 4.71) id 1csl9C-0005SD-6p for mharc-grub-devel@gnu.org; Tue, 28 Mar 2017 03:02:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1csl99-0005Rz-E8 for grub-devel@gnu.org; Tue, 28 Mar 2017 03:02:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1csl96-0005qa-AW for grub-devel@gnu.org; Tue, 28 Mar 2017 03:02:27 -0400 Received: from smtp.nue.novell.com ([195.135.221.5]:55402) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1csl96-0005ms-0q for grub-devel@gnu.org; Tue, 28 Mar 2017 03:02:24 -0400 Received: from emea4-mta.ukb.novell.com ([10.120.13.87]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Tue, 28 Mar 2017 09:02:20 +0200 Received: from linux-9gqx.suse.de (nwb-a10-snat.microfocus.com [10.120.13.202]) by emea4-mta.ukb.novell.com with ESMTP (TLS encrypted); Tue, 28 Mar 2017 08:02:00 +0100 Date: Tue, 28 Mar 2017 15:01:53 +0800 From: Michael Chang To: The development of GNU GRUB Subject: [PATCH] Allocate LVM metadata buffer from raw contents Message-ID: <20170328070153.GA15758@linux-9gqx.suse.de> Mail-Followup-To: The development of GNU GRUB MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 195.135.221.5 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Mar 2017 07:02:28 -0000 The size reserved for on disk LVM metadata area can be exceedingly large that may trigger out of memory error for allocating buffer based on it. Refine the buffer allocation to use size of raw LVM metadata contents and read them from within the metadata area as we only need to parse the JSON formatted contents rather than the entire metadata area. This reduced the size significantly and the likelihood to out of memory error. --- grub-core/disk/lvm.c | 65 ++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 45 insertions(+), 20 deletions(-) diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c index 7b265c7..47aae05 100644 --- a/grub-core/disk/lvm.c +++ b/grub-core/disk/lvm.c @@ -102,9 +102,11 @@ grub_lvm_detect (grub_disk_t disk, { grub_err_t err; grub_uint64_t mda_offset, mda_size; + grub_uint64_t mda_raw_offset, mda_raw_size; char buf[GRUB_LVM_LABEL_SIZE]; char vg_id[GRUB_LVM_ID_STRLEN+1]; char pv_id[GRUB_LVM_ID_STRLEN+1]; + char mdah_buf[sizeof (struct grub_lvm_mda_header) + sizeof (struct grub_lvm_raw_locn)]; char *metadatabuf, *p, *q, *vgname; struct grub_lvm_label_header *lh = (struct grub_lvm_label_header *) buf; struct grub_lvm_pv_header *pvh; @@ -167,21 +169,15 @@ grub_lvm_detect (grub_disk_t disk, dlocn++; mda_offset = grub_le_to_cpu64 (dlocn->offset); - mda_size = grub_le_to_cpu64 (dlocn->size); /* It's possible to have multiple copies of metadata areas, we just use the first one. */ - - /* Allocate buffer space for the circular worst-case scenario. */ - metadatabuf = grub_malloc (2 * mda_size); - if (! metadatabuf) + err = grub_disk_read (disk, 0, mda_offset, sizeof (mdah_buf), mdah_buf); + if (err) goto fail; - err = grub_disk_read (disk, 0, mda_offset, mda_size, metadatabuf); - if (err) - goto fail2; + mdah = (struct grub_lvm_mda_header *) mdah_buf; - mdah = (struct grub_lvm_mda_header *) metadatabuf; if ((grub_strncmp ((char *)mdah->magic, GRUB_LVM_FMTT_MAGIC, sizeof (mdah->magic))) || (grub_le_to_cpu32 (mdah->version) != GRUB_LVM_FMTT_VERSION)) @@ -191,26 +187,55 @@ grub_lvm_detect (grub_disk_t disk, #ifdef GRUB_UTIL grub_util_info ("unknown LVM metadata header"); #endif - goto fail2; + goto fail; } rlocn = mdah->raw_locns; - if (grub_le_to_cpu64 (rlocn->offset) + grub_le_to_cpu64 (rlocn->size) > - grub_le_to_cpu64 (mdah->size)) + + mda_size = grub_le_to_cpu64 (mdah->size); + mda_raw_size = grub_le_to_cpu64 (rlocn->size); + mda_raw_offset = grub_le_to_cpu64 (rlocn->offset); + + metadatabuf = grub_malloc (mda_raw_size); + + if (! metadatabuf) + goto fail; + + if (mda_raw_offset > mda_size) + goto fail2; + + if (mda_raw_offset + mda_raw_size > mda_size) { + err = grub_disk_read (disk, 0, + mda_offset + mda_raw_offset, + mda_size - mda_raw_offset, + metadatabuf); + if (err) + goto fail2; + /* Metadata is circular. Copy the wrap in place. */ - grub_memcpy (metadatabuf + mda_size, - metadatabuf + GRUB_LVM_MDA_HEADER_SIZE, - grub_le_to_cpu64 (rlocn->offset) + - grub_le_to_cpu64 (rlocn->size) - - grub_le_to_cpu64 (mdah->size)); + err = grub_disk_read (disk, 0, + mda_offset + GRUB_LVM_MDA_HEADER_SIZE, + mda_raw_offset + mda_raw_size - mda_size, + metadatabuf + mda_size - mda_raw_offset); + if (err) + goto fail2; + } + else + { + err = grub_disk_read (disk, 0, + mda_offset + mda_raw_offset, + mda_raw_size, + metadatabuf); + if (err) + goto fail2; } - p = q = metadatabuf + grub_le_to_cpu64 (rlocn->offset); + p = q = metadatabuf; - while (*q != ' ' && q < metadatabuf + mda_size) + while (*q != ' ' && q < metadatabuf + mda_raw_size) q++; - if (q == metadatabuf + mda_size) + if (q == metadatabuf + mda_raw_size) { #ifdef GRUB_UTIL grub_util_info ("error parsing metadata"); -- 2.6.6