From: Eric Sandeen <sandeen@redhat.com>
Date: Fri, 16 Sep 2011 20:49:39 +0000 (-0500)
Subject: e4defrag: Check error return of sysconf()
X-Git-Tag: v1.42-WIP-0925~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25726554ca557e22b96684d8a7ecf36ec80572a5;p=thirdparty%2Fe2fsprogs.git

e4defrag: Check error return of sysconf()

In theory sysconf() can fail, so check for an error return.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/misc/e4defrag.c b/misc/e4defrag.c
index eea30571e..cdf4ffb0c 100644
--- a/misc/e4defrag.c
+++ b/misc/e4defrag.c
@@ -399,13 +399,16 @@ static int calc_entry_counts(const char *file EXT2FS_ATTR((unused)),
 static int page_in_core(int fd, struct move_extent defrag_data,
 			unsigned char **vec, unsigned int *page_num)
 {
-	long	pagesize = sysconf(_SC_PAGESIZE);
+	long	pagesize;
 	void	*page = NULL;
 	loff_t	offset, end_offset, length;
 
 	if (vec == NULL || *vec != NULL)
 		return -1;
 
+	pagesize = sysconf(_SC_PAGESIZE);
+	if (pagesize < 0)
+		return -1;
 	/* In mmap, offset should be a multiple of the page size */
 	offset = (loff_t)defrag_data.orig_start * block_size;
 	length = (loff_t)defrag_data.len * block_size;