build: use AM_CPPFLAGS instead of INCLUDES

[platform/upstream/cryptsetup.git] / src / cryptsetup_reencrypt.c

diff --git a/src/cryptsetup_reencrypt.c b/src/cryptsetup_reencrypt.c
index 17d1c88..8bf064c 100644 (file)
--- a/src/cryptsetup_reencrypt.c
+++ b/src/cryptsetup_reencrypt.c
@@ -6,7 +6,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,7 +24,6 @@
 #include <sys/time.h>
 #include <linux/fs.h>
 #include <arpa/inet.h>
-#include <signal.h>
 
 #define PACKAGE_REENC "crypt_reencrypt"
 
@@ -56,8 +56,6 @@ static uint64_t opt_device_size = 0;
 
 static const char **action_argv;
 
-static volatile int quit = 0;
-
 #define MAX_SLOT 8
 struct reenc_ctx {
        char *device;
@@ -107,32 +105,6 @@ static void _quiet_log(int level, const char *msg, void *usrptr)
        tool_log(level, msg, usrptr);
 }
 
-static void int_handler(int sig __attribute__((__unused__)))
-{
-       quit++;
-}
-
-static void set_int_block(int block)
-{
-       sigset_t signals_open;
-
-       sigemptyset(&signals_open);
-       sigaddset(&signals_open, SIGINT);
-       sigaddset(&signals_open, SIGTERM);
-       sigprocmask(block ? SIG_SETMASK : SIG_UNBLOCK, &signals_open, NULL);
-}
-
-static void set_int_handler(void)
-{
-       struct sigaction sigaction_open;
-
-       memset(&sigaction_open, 0, sizeof(struct sigaction));
-       sigaction_open.sa_handler = int_handler;
-       sigaction(SIGINT, &sigaction_open, 0);
-       sigaction(SIGTERM, &sigaction_open, 0);
-       set_int_block(0);
-}
-
 /* The difference in seconds between two times in "timeval" format. */
 static double time_diff(struct timeval start, struct timeval end)
 {
@@ -183,8 +155,8 @@ static int device_check(struct reenc_ctx *rc, header_magic set_magic)
        s = read(devfd, buf, SECTOR_SIZE);
        if (s < 0 || s != SECTOR_SIZE) {
                log_err(_("Cannot read device %s.\n"), rc->device);
-               close(devfd);
-               return -EIO;
+               r = -EIO;
+               goto out;
        }
 
        /* Be sure that we do not process new version of header */
@@ -290,7 +262,9 @@ static int write_log(struct reenc_ctx *rc)
                1, rc->device_uuid, rc->reencrypt_direction,
                rc->device_offset, rc->device_shift);
 
-       lseek(rc->log_fd, 0, SEEK_SET);
+       if (lseek(rc->log_fd, 0, SEEK_SET) == -1)
+               return -EIO;
+
        r = write(rc->log_fd, rc->log_buf, SECTOR_SIZE);
        if (r < 0 || r != SECTOR_SIZE) {
                log_err(_("Cannot write reencryption log file.\n"));
@@ -375,38 +349,27 @@ static void close_log(struct reenc_ctx *rc)
 
 static int open_log(struct reenc_ctx *rc)
 {
-       int flags, create_new;
-       struct stat st;
+       int flags = opt_directio ? O_DIRECT : 0;
 
-       if (!stat(rc->log_file, &st))
-               create_new = 0;
-       else if (errno == ENOENT)
-               create_new = 1;
-       else
-               return -EINVAL;
-
-       if (create_new) {
-               log_dbg("Creating LUKS reencryption log file %s.", rc->log_file);
-               flags = opt_directio ? O_RDWR|O_CREAT|O_DIRECT : O_RDWR|O_CREAT;
-               rc->log_fd = open(rc->log_file, flags, S_IRUSR|S_IWUSR);
-               if (rc->log_fd == -1)
-                       return -EINVAL;
-       } else {
+       rc->log_fd = open(rc->log_file, O_RDWR|O_EXCL|O_CREAT|flags, S_IRUSR|S_IWUSR);
+       if (rc->log_fd != -1) {
+               log_dbg("Created LUKS reencryption log file %s.", rc->log_file);
+       } else if (errno == EEXIST) {
                log_std(_("Log file %s exists, resuming reencryption.\n"), rc->log_file);
-               flags = opt_directio ? O_RDWR|O_DIRECT : O_RDWR;
-               rc->log_fd = open(rc->log_file, flags);
-               if (rc->log_fd == -1)
-                       return -EINVAL;
+               rc->log_fd = open(rc->log_file, O_RDWR|flags);
                rc->in_progress = 1;
        }
 
+       if (rc->log_fd == -1)
+               return -EINVAL;
+
        if (posix_memalign((void *)&rc->log_buf, alignment(rc->log_fd), SECTOR_SIZE)) {
                log_err(_("Allocation of aligned memory failed.\n"));
                close_log(rc);
                return -ENOMEM;
        }
 
-       if (create_new && write_log(rc) < 0) {
+       if (!rc->in_progress && write_log(rc) < 0) {
                close_log(rc);
                return -EIO;
        }
@@ -427,6 +390,7 @@ static int activate_luks_headers(struct reenc_ctx *rc)
            (r = crypt_set_data_device(cd, rc->device)))
                goto out;
 
+       log_verbose(_("Activating temporary device using old LUKS header.\n"));
        if ((r = crypt_activate_by_passphrase(cd, rc->header_file_org,
                opt_key_slot, rc->p[rc->keyslot].password, rc->p[rc->keyslot].passwordLen,
                CRYPT_ACTIVATE_READONLY|CRYPT_ACTIVATE_PRIVATE)) < 0)
@@ -437,6 +401,7 @@ static int activate_luks_headers(struct reenc_ctx *rc)
            (r = crypt_set_data_device(cd_new, rc->device)))
                goto out;
 
+       log_verbose(_("Activating temporary device using new LUKS header.\n"));
        if ((r = crypt_activate_by_passphrase(cd_new, rc->header_file_new,
                opt_key_slot, rc->p[rc->keyslot].password, rc->p[rc->keyslot].passwordLen,
                CRYPT_ACTIVATE_SHARED|CRYPT_ACTIVATE_PRIVATE)) < 0)
@@ -656,6 +621,7 @@ static void print_progress(struct reenc_ctx *rc, uint64_t bytes, int final)
        if (!mib)
                return;
 
+       /* FIXME: calculate this from last minute only and remaining space */
        eta = (unsigned long long)(rc->device_size / 1024 / 1024 / mib - tdiff);
 
        /* vt100 code clear line */
@@ -822,7 +788,7 @@ static int copy_data(struct reenc_ctx *rc)
                goto out;
        }
 
-       set_int_handler();
+       set_int_handler(0);
        gettimeofday(&rc->start_time, NULL);
 
        if (rc->reencrypt_direction == FORWARD)
@@ -884,7 +850,7 @@ static int init_passphrase1(struct reenc_ctx *rc, struct crypt_device *cd,
 
        retry_count = opt_tries ?: 1;
        while (retry_count--) {
-               set_int_handler();
+               set_int_handler(0);
                r = crypt_get_key(msg, &rc->p[slot].password,
                        &rc->p[slot].passwordLen,
                        0, 0, NULL /*opt_key_file*/,