[PATH,i-g-t] igt_sysfs: Avoid double closing the fd in igt_sysfs_scanf

Commit Message

Tvrtko Ursulin Sept. 13, 2018, 3:06 p.m. UTC

From: Tvrtko Ursulin <[e-mail]>

fdopen takes ownership of the fd so only one flavour of closing it is
needed.

Signed-off-by: Tvrtko Ursulin <[e-mail]>
---
 lib/igt_sysfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Chris Wilson Sept. 13, 2018, 3:20 p.m. UTC | #1

Quoting Tvrtko Ursulin (2018-09-13 16:06:13)
> From: Tvrtko Ursulin <[e-mail]>
> 
> fdopen takes ownership of the fd so only one flavour of closing it is
> needed.

Indeed, I always seem to get burned by this. One day I might remember...
Who am I kidding? :)
 
> Signed-off-by: Tvrtko Ursulin <[e-mail]>
Reviewed-by: Chris Wilson <[e-mail]>
-Chris

Patch

diff --git a/lib/igt_sysfs.c b/lib/igt_sysfs.c
index 9012cc73f6e3..d323b81dd986 100644
--- a/lib/igt_sysfs.c
+++ b/lib/igt_sysfs.c
@@ -379,8 +379,9 @@  int igt_sysfs_scanf(int dir, const char *attr, const char *fmt, ...)
 		va_end(ap);
 
 		fclose(file);
+	} else {
+		close(fd);
 	}
-	close(fd);
 
 	return ret;
 }