mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-16 10:20:30 +00:00
Code Issues Releases Activity

Handle malloc() failures more gracefully by error'ing out rather than

Browse Source 
segfaulting.

Submitted by:	gcooper
MFC after:	1 week
This commit is contained in:
John Baldwin 2010-11-19 15:39:59 +00:00
parent ad520892d7
commit 3c22a809ec
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=215526
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
usr.sbin/mfiutil/mfi_config.c
View File

@ -328,6 +328,10 @@ parse_array(int fd, int raid_type, char *array_str, struct array_info *info)
/* 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");

4
usr.sbin/mfiutil/mfi_evt.c
View File

@ -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) {

4
usr.sbin/mfiutil/mfi_flash.c
View File

@ -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);