From affded869cee02bd59561f75cb478134f5ee4adf Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 23 Apr 2018 15:05:06 +0300
Subject: [PATCH] doveadm save: Fix using <file without panic

When getting input with <file with Linux/epoll, it crashed with:

Panic: epoll_ctl(add, 0) failed: Operation not permitted (fd doesn't support epoll - instead of '<file', try 'cat file|')
---
 src/doveadm/doveadm-mail.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 1890f72da4..1483273381 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -203,17 +203,19 @@ static void doveadm_mail_cmd_input_read(struct doveadm_mail_cmd_context *ctx)
 	struct timeout *to;
 
 	ioloop = io_loop_create();
-	io = io_add(ctx->cmd_input_fd, IO_READ,
-		    doveadm_mail_cmd_input_input, ctx);
-	to = timeout_add(DOVEADM_MAIL_CMD_INPUT_TIMEOUT_MSECS,
-			 doveadm_mail_cmd_input_timeout, ctx);
-	/* read the pending input from stream. */
+	/* Read the pending input from stream. Delay adding the IO in case
+	   we're reading from a file. That would cause a panic with epoll. */
 	io_loop_set_running(ioloop);
 	doveadm_mail_cmd_input_input(ctx);
-	if (io_loop_is_running(ioloop))
+	if (io_loop_is_running(ioloop)) {
+		io = io_add(ctx->cmd_input_fd, IO_READ,
+			    doveadm_mail_cmd_input_input, ctx);
+		to = timeout_add(DOVEADM_MAIL_CMD_INPUT_TIMEOUT_MSECS,
+				 doveadm_mail_cmd_input_timeout, ctx);
 		io_loop_run(ioloop);
-	io_remove(&io);
-	timeout_remove(&to);
+		io_remove(&io);
+		timeout_remove(&to);
+	}
 	io_loop_destroy(&ioloop);
 
 	i_assert(ctx->cmd_input->eof);