diff options
| author | Hans Rosenfeld <hans.rosenfeld@nexenta.com> | 2012-08-02 04:58:41 -0500 |
|---|---|---|
| committer | Hans Rosenfeld <hans.rosenfeld@nexenta.com> | 2012-08-02 04:58:41 -0500 |
| commit | 14d44f2248cc2a54490db7f7caa4da5968f90837 (patch) | |
| tree | f1547f24b3208f52a0bd40f536075bbf91ca14ff /usr/src/cmd/boot/installboot/installboot.c | |
| parent | e828a46d29ad418487f50d56b5c19e2a1f9033a7 (diff) | |
| download | illumos-joyent-14d44f2248cc2a54490db7f7caa4da5968f90837.tar.gz | |
3027 installgrub can segfault when encountering bogus data on disk
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/cmd/boot/installboot/installboot.c')
| -rw-r--r-- | usr/src/cmd/boot/installboot/installboot.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr/src/cmd/boot/installboot/installboot.c b/usr/src/cmd/boot/installboot/installboot.c index cab6670608..2a4f48fd18 100644 --- a/usr/src/cmd/boot/installboot/installboot.c +++ b/usr/src/cmd/boot/installboot/installboot.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. */ #include <stdio.h> @@ -252,6 +253,8 @@ read_bootblock_from_disk(int dev_fd, ib_bootblock_t *bblock) bblock->mboot = (multiboot_header_t *)(bblock->buf + bblock->mboot_off + BBLK_DATA_RSVD_SIZE); bblock->extra = (char *)bblock->mboot + sizeof (multiboot_header_t); + bblock->extra_size = bblock->buf_size - bblock->mboot_off + - BBLK_DATA_RSVD_SIZE - sizeof (multiboot_header_t); return (BC_SUCCESS); } @@ -279,7 +282,7 @@ is_update_necessary(ib_data_t *data, char *updt_str) return (B_TRUE); } - einfo = find_einfo(bblock_disk.extra); + einfo = find_einfo(bblock_disk.extra, bblock_disk.extra_size); if (einfo == NULL) { BOOT_DEBUG("No extended information available\n"); return (B_TRUE); @@ -716,7 +719,7 @@ handle_getinfo(char *progname, char **argv) goto out_dev; } - einfo = find_einfo(bblock->extra); + einfo = find_einfo(bblock->extra, bblock->extra_size); if (einfo == NULL) { retval = BC_NOEINFO; (void) fprintf(stderr, gettext("No extended information " @@ -817,7 +820,7 @@ handle_mirror(char *progname, char **argv) goto out_devs; } - einfo_curr = find_einfo(bblock_curr->extra); + einfo_curr = find_einfo(bblock_curr->extra, bblock_curr->extra_size); if (einfo_curr != NULL) updt_str = einfo_get_string(einfo_curr); |