Artur Wojcik: Fix for resource leak on error path.

Martin F. Krafft madduck at alioth.debian.org
Wed Jan 27 02:03:59 UTC 2010


Module: mdadm
Branch: upstream
Commit: 922f66a935df8e6b3b66073a89c47c68c2e8cbe3
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=922f66a935df8e6b3b66073a89c47c68c2e8cbe3

Author: Artur Wojcik <artur.wojcik at intel.com>
Date:   Thu Dec 10 12:03:40 2009 -0700

Fix for resource leak on error path.

Make sure opened file descriptors are cleaned up
in the exit path when error occured.

Signed-off-by: Artur Wojcik <artur.wojcik at intel.com>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>

---

 probe_roms.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/probe_roms.c b/probe_roms.c
index a9a8638..0f0ffbc 100644
--- a/probe_roms.c
+++ b/probe_roms.c
@@ -80,7 +80,7 @@ void probe_roms_exit(void)
 
 int probe_roms_init(unsigned long align)
 {
-	int fd;
+	int fd = -1;
 	int rc = 0;
 
 	/* valid values are 2048 and 512.  512 is for PCI-3.0 compliant
@@ -107,9 +107,11 @@ int probe_roms_init(unsigned long align)
 
 	if (rc == 0)
 		rom_fd = fd;
-	else
+	else {
+		if (fd >= 0) 
+			close(fd);
 		probe_roms_exit();
-
+	}
 	return rc;
 }
 




More information about the pkg-mdadm-commits mailing list