From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 18 Nov 2016 13:46:39 +0000 (+0200)
Subject: lib-index: If mmap() fails, include the attempted size in the error.
X-Git-Tag: 2.3.0.rc1~2571
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ade0d76250bc7db405cd20f3e1b660f74c77bd4;p=thirdparty%2Fdovecot%2Fcore.git

lib-index: If mmap() fails, include the attempted size in the error.
---

diff --git a/src/lib-index/mail-cache.c b/src/lib-index/mail-cache.c
index b5b4876b0e..f244f99dc0 100644
--- a/src/lib-index/mail-cache.c
+++ b/src/lib-index/mail-cache.c
@@ -480,7 +480,8 @@ int mail_cache_map(struct mail_cache *cache, size_t offset, size_t size,
 	if (cache->mmap_base == MAP_FAILED) {
 		cache->mmap_base = NULL;
 		cache->mmap_length = 0;
-		mail_cache_set_syscall_error(cache, "mmap()");
+		mail_cache_set_syscall_error(cache, t_strdup_printf(
+			"mmap(size=%"PRIuSIZE_T")", cache->mmap_length));
 		return -1;
 	}
 	*data_r = offset > cache->mmap_length ? NULL :
diff --git a/src/lib-index/mail-index-map-read.c b/src/lib-index/mail-index-map-read.c
index 371778da92..be2b854564 100644
--- a/src/lib-index/mail-index-map-read.c
+++ b/src/lib-index/mail-index-map-read.c
@@ -47,7 +47,8 @@ static int mail_index_mmap(struct mail_index_map *map, uoff_t file_size)
 				  MAP_PRIVATE, index->fd, 0);
 	if (rec_map->mmap_base == MAP_FAILED) {
 		rec_map->mmap_base = NULL;
-		mail_index_set_syscall_error(index, "mmap()");
+		mail_index_set_syscall_error(index, t_strdup_printf(
+			"mmap(size=%"PRIuSIZE_T")", file_size));
 		return -1;
 	}
 	rec_map->mmap_size = file_size;
diff --git a/src/lib-index/mail-transaction-log-file.c b/src/lib-index/mail-transaction-log-file.c
index bcfedcce0c..def77bb5d1 100644
--- a/src/lib-index/mail-transaction-log-file.c
+++ b/src/lib-index/mail-transaction-log-file.c
@@ -1616,7 +1616,8 @@ mail_transaction_log_file_mmap(struct mail_transaction_log_file *file)
 	if (file->mmap_base == MAP_FAILED) {
 		file->mmap_base = NULL;
 		file->mmap_size = 0;
-		log_file_set_syscall_error(file, "mmap()");
+		log_file_set_syscall_error(file, t_strdup_printf(
+			"mmap(size=%"PRIuSIZE_T")", file->mmap_size));
 		return -1;
 	}