Skip to contentSkip to conversation

x86: tools/relocs.c: fix resource leakage

PATCH In review Cong Ding 1 participant 3 messages Jan 14, 2013 – Jan 28, 2013 x86

lore
Share & tools
lore

Cong Ding

author
#0 lore raw

PATCH 1/1 x86: tools/relocs.c: fix resource leakage

the opened file should be closed.

Signed-off-by Cong Ding <[email protected]>
---
 arch/x86/tools/relocs.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/tools/relocs.c +4 -2
index 5a1847d..79d67bd 100644
@@ -814,12 +814,14 @@ int main(int argc, char **argv)
 	read_relocs(fp);
 	if (show_absolute_syms) {
 		print_absolute_symbols();
-		return 0;
+		goto out;
 	}
 	if (show_absolute_relocs) {
 		print_absolute_relocs();
-		return 0;
+		goto out;
 	}
 	emit_relocs(as_text, use_real_mode);
+out:
+	fclose(fp);
 	return 0;
 }
Signature · 1 line
1.7.9.5
author
#1 lore raw

[tip:x86/boot] x86/boot: Fix minor fd leakage in tools/relocs.c

Commit-ID:  585376216a829d1ddfb3e57cb50c72c23adb484f
Gitweb:     http://git.kernel.org/tip/585376216a829d1ddfb3e57cb50c72c23adb484f
Author:     Cong Ding <[email protected]>
AuthorDate: Mon, 14 Jan 2013 17:13:35 +0000
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 24 Jan 2013 13:07:23 +0100

x86/boot: Fix minor fd leakage in tools/relocs.c

The opened file should be closed.

Signed-off-by Cong Ding <[email protected]>
Cc Kusanagi Kouichi <[email protected]>
Cc Jarkko Sakkinen <[email protected]>
Cc Jiri Kosina <[email protected]>
Cc Matt Fleming <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/tools/relocs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/tools/relocs.c +4 -2
index 5a1847d..79d67bd 100644
@@ -814,12 +814,14 @@ int main(int argc, char **argv)
 	read_relocs(fp);
 	if (show_absolute_syms) {
 		print_absolute_symbols();
-		return 0;
+		goto out;
 	}
 	if (show_absolute_relocs) {
 		print_absolute_relocs();
-		return 0;
+		goto out;
 	}
 	emit_relocs(as_text, use_real_mode);
+out:
+	fclose(fp);
 	return 0;
 }
author
#2 lore raw

[tip:x86/boot] x86/boot: Fix minor fd leakage in tools/relocs.c

In reply to Cong Ding
Commit-ID:  65315d4889d403ea025081d8ca85ddf7b9c10f39
Gitweb:     http://git.kernel.org/tip/65315d4889d403ea025081d8ca85ddf7b9c10f39
Author:     Cong Ding <[email protected]>
AuthorDate: Mon, 14 Jan 2013 17:13:35 +0000
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Sun, 27 Jan 2013 10:24:28 -0800

x86/boot: Fix minor fd leakage in tools/relocs.c

The opened file should be closed.

Signed-off-by Cong Ding <[email protected]>
Cc Kusanagi Kouichi <[email protected]>
Cc Jarkko Sakkinen <[email protected]>
Cc Jiri Kosina <[email protected]>
Cc Matt Fleming <[email protected]>
Link http://lkml.kernel.org/r/[email protected] open here
Signed-off-by Ingo Molnar <[email protected]>
---
 arch/x86/tools/relocs.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/tools/relocs.c +4 -2
index 5a1847d..79d67bd 100644
@@ -814,12 +814,14 @@ int main(int argc, char **argv)
 	read_relocs(fp);
 	if (show_absolute_syms) {
 		print_absolute_symbols();
-		return 0;
+		goto out;
 	}
 	if (show_absolute_relocs) {
 		print_absolute_relocs();
-		return 0;
+		goto out;
 	}
 	emit_relocs(as_text, use_real_mode);
+out:
+	fclose(fp);
 	return 0;
 }