From 824864f4e02b70d7a37221070b3eda1a953509da Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Tue, 19 Mar 2013 13:44:11 +0100 Subject: [PATCH] Don't try to mmap() empty ipsec.secret files --- src/libcharon/plugins/stroke/stroke_cred.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libcharon/plugins/stroke/stroke_cred.c b/src/libcharon/plugins/stroke/stroke_cred.c index c401bc6f1..e9da477fa 100644 --- a/src/libcharon/plugins/stroke/stroke_cred.c +++ b/src/libcharon/plugins/stroke/stroke_cred.c @@ -991,6 +991,11 @@ static void load_secrets(private_stroke_cred_t *this, char *file, int level, close(fd); return; } + if (sb.st_size == 0) + { /* skip empty files, as mmap() complains */ + close(fd); + return; + } addr = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); if (addr == MAP_FAILED) { @@ -1262,4 +1267,3 @@ stroke_cred_t *stroke_cred_create() return &this->public; } -