[PATCH 06/12] disk_init_and_add(): Fail if opening sysfs file descriptors fail

[PATCH 00/12] More leak and NULL pointer dereference fixes · <hidden> · 2011-11-02
[PATCH 01/12] mdadm: add missing break for UpdateSubarray · <hidden> · 2011-11-02
[PATCH 02/12] ping_monitor(): check file descriptor is valid before using and closing it · <hidden> · 2011-11-02
[PATCH 03/12] mdstat_read(): Check return value of dup() before using file descriptor · <hidden> · 2011-11-02
[PATCH 04/12] get_component_size(): Check read() return value for error before using it · <hidden> · 2011-11-02
[PATCH 05/12] array_try_spare(): open_dev() returns -1 on error, not zero · <hidden> · 2011-11-02
[PATCH 06/12] disk_init_and_add(): Fail if opening sysfs file descriptors fail · <hidden> · 2011-11-02
[PATCH 07/12] close_aa(): Verify file descriptors are valid before trying to close them · <hidden> · 2011-11-02
[PATCH 08/12] ahci_enumerate_ports(): Don't close fd that failed to open · <hidden> · 2011-11-02
[PATCH 09/12] unblock_monitor(): Check sra is valid before dereferencing · <hidden> · 2011-11-02
[PATCH 10/12] Manage_ro(): Check pointer rather than dereferencing it · <hidden> · 2011-11-02
[PATCH 11/12] fd2devname(): Don't dereference NULL pointer · <hidden> · 2011-11-02
[PATCH 12/12] match_metadata_desc(): Fix memory leak · <hidden> · 2011-11-02
Re: [PATCH 00/12] More leak and NULL pointer dereference fixes · NeilBrown <hidden> · 2011-11-02
Re: [PATCH 00/12] More leak and NULL pointer dereference fixes · Jes Sorensen <hidden> · 2011-11-03

STALE5356d

From: <hidden>
Date: 2011-11-02 14:42:11
Subsystem: the rest · Maintainer: Linus Torvalds

From: Jes Sorensen <redacted>

Signed-off-by: Jes Sorensen <redacted>
---
 managemon.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/managemon.c b/managemon.c
index 9e0a34d..fceaeb9 100644
--- a/managemon.c
+++ b/managemon.c

@@ -409,7 +409,13 @@ static int disk_init_and_add(struct mdinfo *disk, struct mdinfo *clone,
 
 	*disk = *clone;
 	disk->recovery_fd = sysfs_open(aa->devnum, disk->sys_name, "recovery_start");
+	if (disk->recovery_fd < 0)
+		return -1;
 	disk->state_fd = sysfs_open(aa->devnum, disk->sys_name, "state");
+	if (disk->state_fd < 0) {
+		close(disk->recovery_fd);
+		return -1;
+	}
 	disk->prev_state = read_dev_state(disk->state_fd);
 	disk->curr_state = disk->prev_state;
 	disk->next = aa->info.devs;

-- 
1.7.6.4

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help