[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

STALE5377d

[PATCH 07/12] close_aa(): Verify file descriptors are valid before trying to close them

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

From: Jes Sorensen <redacted>

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

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

@@ -117,11 +117,16 @@ static void close_aa(struct active_array *aa)
 		close(d->state_fd);
 	}
 
-	close(aa->action_fd);
-	close(aa->info.state_fd);
-	close(aa->resync_start_fd);
-	close(aa->metadata_fd);
-	close(aa->sync_completed_fd);
+	if (aa->action_fd >= 0)
+		close(aa->action_fd);
+	if (aa->info.state_fd >= 0)
+		close(aa->info.state_fd);
+	if (aa->resync_start_fd >= 0)
+		close(aa->resync_start_fd);
+	if (aa->metadata_fd >= 0)
+		close(aa->metadata_fd);
+	if (aa->sync_completed_fd >= 0)
+		close(aa->sync_completed_fd);
 }
 
 static void free_aa(struct active_array *aa)

-- 
1.7.6.4