serial-{get,reset}-counter: Close the fd before exiting

Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
bootlin · Jun 22, 2021 · 5ff6f1b · 5ff6f1b
1 parent d827182
commit 5ff6f1b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/lab-data/linux-kernel/modules/nfsroot/root/serial/serial-get-counter.c b/lab-data/linux-kernel/modules/nfsroot/root/serial/serial-get-counter.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
 
 #define SERIAL_RESET_COUNTER 0
 #define SERIAL_GET_COUNTER 1
@@ -31,6 +32,14 @@ int main(int argc, char *argv[])
 	if (ret < 0) {
 		fprintf(stderr, "Unable to get counter: %s\n",
 			strerror(errno));
+		close(fd);
+		exit(1);
+	}
+
+	ret = close(fd);
+	if (ret < 0) {
+		fprintf(stderr, "Unable to close %s: %s\n", argv[1],
+			strerror(errno));
 		exit(1);
 	}
 

diff --git a/lab-data/linux-kernel/modules/nfsroot/root/serial/serial-reset-counter.c b/lab-data/linux-kernel/modules/nfsroot/root/serial/serial-reset-counter.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
 
 #define SERIAL_RESET_COUNTER 0
 #define SERIAL_GET_COUNTER 1
@@ -30,9 +31,16 @@ int main(int argc, char *argv[])
 	if (ret < 0) {
 		fprintf(stderr, "Unable to reset counter: %s\n",
 			strerror(errno));
+		close(fd);
 		exit(1);
 	}
 
+	ret = close(fd);
+	if (ret < 0) {
+		fprintf(stderr, "Unable to close %s: %s\n", argv[1],
+			strerror(errno));
+		exit(1);
+	}
 
 	printf("Counter reset\n");
 	return 0;