From 825fc895dcd025760a2de09a8355a7841556653b Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Sun, 14 Oct 2018 20:36:45 +0200 Subject: [PATCH] Fix some signed/unsigned comparison warnings. --- lib/luks1/keyencryption.c | 2 +- lib/utils_io.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/luks1/keyencryption.c b/lib/luks1/keyencryption.c index 5819db6a..9c948f74 100644 --- a/lib/luks1/keyencryption.c +++ b/lib/luks1/keyencryption.c @@ -250,7 +250,7 @@ int LUKS_decrypt_from_storage(char *dst, size_t dstLength, if (read_lseek_blockwise(devfd, device_block_size(device), device_alignment(device), dst, dstLength, sector * SECTOR_SIZE) < 0) { - if (!fstat(devfd, &st) && (st.st_size < dstLength)) + if (!fstat(devfd, &st) && (st.st_size < (off_t)dstLength)) log_err(ctx, _("Device %s is too small."), device_path(device)); else log_err(ctx, _("IO error while decrypting keyslot.")); diff --git a/lib/utils_io.c b/lib/utils_io.c index d7e1cbef..f15b861d 100644 --- a/lib/utils_io.c +++ b/lib/utils_io.c @@ -184,7 +184,7 @@ ssize_t read_blockwise(int fd, size_t bsize, size_t alignment, out: free(hangover_buf); if (buf != orig_buf) { - if (ret == length) + if (ret != -1) memcpy(orig_buf, buf, length); free(buf); }