3027 installgrub can segfault when encountering bogus data on disk

          --- old/usr/src/cmd/boot/common/mboot_extra.h
          +++ new/usr/src/cmd/boot/common/mboot_extra.h

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
  23   23   */
  24   24  
  25   25  #ifndef _MBOOT_EXTRA_H
  26   26  #define _MBOOT_EXTRA_H
  27   27  
  28   28  #ifdef  __cplusplus
  29   29  extern "C" {
  30   30  #endif
  31   31  
  32   32  #include <stdarg.h>
  33   33  #include <sys/types.h>
  34   34  #include "bblk_einfo.h"
  35   35  
  36   36  /* multiboot header needs to be located in the first 32KB. */
  37   37  #define MBOOT_SCAN_SIZE         (32 * 1024 * 1024)
  38   38  

  39   39  /* multiboot header AOUT_KLUDGE flag. */
  40   40  #define BB_MBOOT_AOUT_FLAG      (0x00010000)
  41   41  
  42   42  /* Extra header preceeding the payloads at the end of the bootblock. */
  43   43  typedef struct _bb_extra_header {
  44   44          uint32_t        size;
  45   45          uint32_t        checksum;
  46   46  } bb_header_ext_t;
  47   47  
  48   48  uint32_t compute_checksum(char *, uint32_t);
  49      -bblk_einfo_t *find_einfo(char *);
       49 +bblk_einfo_t *find_einfo(char *, uint32_t);
  50   50  int find_multiboot(char *, uint32_t, uint32_t *);
  51   51  void add_einfo(char *, char *, bblk_hs_t *, uint32_t);
  52   52  int compare_bootblocks(char *, char *, char **);
  53   53  
  54   54  #ifdef  __cplusplus
  55   55  }
  56   56  #endif
  57   57  
  58   58  #endif /* _MBOOT_EXTRA_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX