util: Don't leak a file descriptor in read_file

If memory allocation fails, we should close the file descriptor
before returning the error.

Also remove unneeded parentheses on return, return isn't a function.

Signed-off-by: Jean Delvare <[email protected]>
Fixes: 2339e72 ("util: Add read_file() function for reading sysfs files")

Author: jdelvare

CHANGELOG

@@ -1,3 +1,7 @@
+2017-04-11  Jean Delvare  <[email protected]>
+
+	* util.c: Don't leak a file descriptor in function read_file.
+
 2017-04-10  Jean Delvare  <[email protected]>
 
 	* dmidecode.c: Decode the processor ID of the Intel Core M, AMD

util.c

@@ -113,13 +113,13 @@ void *read_file(size_t *max_len, const char *filename)
 	{
 		if (errno != ENOENT)
 			perror(filename);
-		return(NULL);
+		return NULL;
 	}
 
 	if ((p = malloc(*max_len)) == NULL)
 	{
 		perror("malloc");
-		return NULL;
+		goto out;
 	}
 
 	do
@@ -129,19 +129,20 @@ void *read_file(size_t *max_len, const char *filename)
 		{
 			if (errno != EINTR)
 			{
-				close(fd);
 				perror(filename);
 				free(p);
-				return NULL;
+				p = NULL;
+				goto out;
 			}
 		}
 		else
 			r2 += r;
 	}
 	while (r != 0);
 
-	close(fd);
 	*max_len = r2;
+out:
+	close(fd);
 
 	return p;
 }