[PATCH 02/10] scripts/basic/fixdep: Complete error handling in print_deps()

SF Markus Elfring
2016-10-28T08:32:49Z

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 27 Oct 2016 18:08:30 +0200

Return values were not checked from calls of the functions "close"
and "munmap".

This issue was detected also by using the Coccinelle software.

Add a bit of exception handling there.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
scripts/basic/fixdep.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index fff818b..c9ce3e3 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -113,6 +113,7 @@
#include <limits.h>
#include <ctype.h>
#include <arpa/inet.h>
+#include <errno.h>

int insert_extra_deps;
char *target;
@@ -413,21 +414,24 @@ static void print_deps(void)
}
if (st.st_size = 0) {
fprintf(stderr,"fixdep: %s is empty\n",depfile);
- close(fd);
- return;
+ goto close_fd;
}
map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
if ((long) map = -1) {
perror("fixdep: mmap");
- close(fd);
- return;
+ goto close_fd;
}

parse_dep_file(map, st.st_size);
-
- munmap(map, st.st_size);
-
- close(fd);
+ if (munmap(map, st.st_size))
+ perror("fixdep: munmap");
+close_fd:
+ if (close(fd)) {
+ int code = errno;
+
+ perror("fixdep: close");
+ exit(code);
+ }
}

int main(int argc, char *argv[])
--
2.10.1