Author: jhb
Date: Fri Nov 19 15:39:59 2010
New Revision: 215526
URL: http://svn.freebsd.org/changeset/base/215526
Log:
Handle malloc() failures more gracefully by error'ing out rather than
segfaulting.
Submitted by: gcooper
MFC after: 1 week
Modified:
head/usr.sbin/mfiutil/mfi_config.c
head/usr.sbin/mfiutil/mfi_evt.c
head/usr.sbin/mfiutil/mfi_flash.c
Modified: head/usr.sbin/mfiutil/mfi_config.c
==============================================================================
--- head/usr.sbin/mfiutil/mfi_config.c Fri Nov 19 15:12:19 2010
(r215525)
+++ head/usr.sbin/mfiutil/mfi_config.c Fri Nov 19 15:39:59 2010
(r215526)
@@ -328,6 +328,10 @@ parse_array(int fd, int raid_type, char
/* Validate each drive. */
info->drives = calloc(count, sizeof(struct mfi_pd_info));
+ if (info->drives == NULL) {
+ warnx("malloc failed");
+ return (ENOMEM);
+ }
info->drive_count = count;
for (pinfo = info->drives; (cp = strsep(&array_str, ",")) != NULL;
pinfo++) {
@@ -638,6 +642,10 @@ create_volume(int ac, char **av)
break;
}
arrays = calloc(narrays, sizeof(*arrays));
+ if (arrays == NULL) {
+ warnx("malloc failed");
+ return (ENOMEM);
+ }
for (i = 0; i < narrays; i++) {
error = parse_array(fd, raid_type, av[i], &arrays[i]);
if (error)
@@ -673,6 +681,10 @@ create_volume(int ac, char **av)
state.array_count = config->array_count;
if (config->array_count > 0) {
state.arrays = calloc(config->array_count, sizeof(int));
+ if (state.arrays == NULL) {
+ warnx("malloc failed");
+ return (ENOMEM);
+ }
for (i = 0; i < config->array_count; i++) {
ar = (struct mfi_array *)p;
state.arrays[i] = ar->array_ref;
@@ -685,6 +697,10 @@ create_volume(int ac, char **av)
state.log_drv_count = config->log_drv_count;
if (config->log_drv_count) {
state.volumes = calloc(config->log_drv_count, sizeof(int));
+ if (state.volumes == NULL) {
+ warnx("malloc failed");
+ return (ENOMEM);
+ }
for (i = 0; i < config->log_drv_count; i++) {
ld = (struct mfi_ld_config *)p;
state.volumes[i] = ld->properties.ld.v.target_id;
@@ -721,6 +737,10 @@ create_volume(int ac, char **av)
config_size = sizeof(struct mfi_config_data) +
sizeof(struct mfi_ld_config) * nvolumes + MFI_ARRAY_SIZE * narrays;
config = calloc(1, config_size);
+ if (config == NULL) {
+ warnx("malloc failed");
+ return (ENOMEM);
+ }
config->size = config_size;
config->array_count = narrays;
config->array_size = MFI_ARRAY_SIZE; /* XXX: Firmware hardcode */
@@ -902,6 +922,10 @@ add_spare(int ac, char **av)
spare = malloc(sizeof(struct mfi_spare) + sizeof(uint16_t) *
config->array_count);
+ if (spare == NULL) {
+ warnx("malloc failed");
+ return (ENOMEM);
+ }
bzero(spare, sizeof(struct mfi_spare));
spare->ref = info.ref;
@@ -1170,6 +1194,10 @@ dump(int ac, char **av)
}
config = malloc(len);
+ if (config == NULL) {
+ warnx("malloc failed");
+ return (ENOMEM);
+ }
if (sysctlbyname(buf, config, &len, NULL, 0) < 0) {
error = errno;
warn("Failed to read debug command");
Modified: head/usr.sbin/mfiutil/mfi_evt.c
==============================================================================
--- head/usr.sbin/mfiutil/mfi_evt.c Fri Nov 19 15:12:19 2010
(r215525)
+++ head/usr.sbin/mfiutil/mfi_evt.c Fri Nov 19 15:39:59 2010
(r215526)
@@ -624,6 +624,10 @@ show_events(int ac, char **av)
}
list = malloc(size);
+ if (list == NULL) {
+ warnx("malloc failed");
+ return (ENOMEM);
+ }
for (seq = start;;) {
if (mfi_get_events(fd, list, num_events, filter, seq,
&status) < 0) {
Modified: head/usr.sbin/mfiutil/mfi_flash.c
==============================================================================
--- head/usr.sbin/mfiutil/mfi_flash.c Fri Nov 19 15:12:19 2010
(r215525)
+++ head/usr.sbin/mfiutil/mfi_flash.c Fri Nov 19 15:39:59 2010
(r215526)
@@ -163,6 +163,10 @@ flash_adapter(int ac, char **av)
/* Upload the file 64k at a time. */
buf = malloc(FLASH_BUF_SIZE);
+ if (buf == NULL) {
+ warnx("malloc failed");
+ return (ENOMEM);
+ }
offset = 0;
while (sb.st_size > 0) {
nread = read(flash, buf, FLASH_BUF_SIZE);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
