[PATCH 02/19] Grow_addbitmap(): don't try to close a file descriptor which... | linux-raid

[PATCH 00/19] More fixes for resource leaks and warnings · <hidden> · 2011-11-01
[PATCH 01/19] Grow_Add_device(): dev_open() return a negative fd on error · <hidden> · 2011-11-01
[PATCH 02/19] Grow_addbitmap(): don't try to close a file descriptor which failed to open · <hidden> · 2011-11-01
[PATCH 03/19] Incremental(): Check return value of dev_open() before trying to use it · <hidden> · 2011-11-01
[PATCH 04/19] sysfs_unique_holder(): Check read() return value before using as buffer index · <hidden> · 2011-11-01
[PATCH 05/19] remove_devices(): readlink returns -1 on error · <hidden> · 2011-11-01
[PATCH 06/19] assemble_container_content(): fix memory leak · <hidden> · 2011-11-01
[PATCH 07/19] Grow_restart(): free() offsets after use · <hidden> · 2011-11-01
[PATCH 08/19] Assemble(): don't dup_super() before we need it. · <hidden> · 2011-11-01
[PATCH 09/19] Detail(): Remember to free 'avail' · <hidden> · 2011-11-01
[PATCH 10/19] Grow_reshape(): Fix another 'sra' leak · <hidden> · 2011-11-01
[PATCH 11/19] enough_fd(): remember to free buffer for avail array · <hidden> · 2011-11-01
[PATCH 12/19] Manage_subdevs(): avoid leaking super · <hidden> · 2011-11-01
[PATCH 13/19] IncrementalScan(): Fix memory leak · <hidden> · 2011-11-01
[PATCH 14/19] Managa_ro(): free() mdi before exiting · <hidden> · 2011-11-01
[PATCH 15/19] Manage_runstop(): Avoid memory leak · <hidden> · 2011-11-01
[PATCH 16/19] Monitor(): free allocated memory on exit · <hidden> · 2011-11-01
[PATCH 17/19] bitmap_fd_read(): fix memory leak · <hidden> · 2011-11-01
[PATCH 18/19] validate_geometry_imsm_volume(): Avoid NULL pointer dereference · <hidden> · 2011-11-01
[PATCH 19/19] make_parts(): Avoid false positive security warning · <hidden> · 2011-11-01
Re: [PATCH 19/19] make_parts(): Avoid false positive security warning · Jes Sorensen <hidden> · 2011-11-01
Re: [PATCH 00/19] More fixes for resource leaks and warnings · NeilBrown <hidden> · 2011-11-02
Re: [PATCH 00/19] More fixes for resource leaks and warnings · Jes Sorensen <hidden> · 2011-11-02
Re: [PATCH 00/19] More fixes for resource leaks and warnings · Doug Ledford <hidden> · 2011-11-02

STALE5344d

[PATCH 02/19] Grow_addbitmap(): don't try to close a file descriptor which failed to open

From: <hidden>
Date: 2011-11-01 15:09:18
Subsystem: the rest · Maintainer: Linus Torvalds

From: Jes Sorensen <redacted>

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

diff --git a/Grow.c b/Grow.c
index 9ee22e0..93a1fba 100644
--- a/Grow.c
+++ b/Grow.c

@@ -442,13 +442,14 @@ int Grow_addbitmap(char *devname, int fd, char *file, int chunk, int delay, int
 			dv = map_dev(disk.major, disk.minor, 1);
 			if (!dv) continue;
 			fd2 = dev_open(dv, O_RDONLY);
-			if (fd2 >= 0 &&
-			    st->ss->load_super(st, fd2, NULL) == 0) {
+			if (fd2 >= 0) {
+				if (st->ss->load_super(st, fd2, NULL) == 0) {
+					close(fd2);
+					st->ss->uuid_from_super(st, uuid);
+					break;
+				}
 				close(fd2);
-				st->ss->uuid_from_super(st, uuid);
-				break;
 			}
-			close(fd2);
 		}
 		if (d == max_devs) {
 			fprintf(stderr, Name ": cannot find UUID for array!\n");

-- 
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