From 798967aba3e01dc1b16c49c566b2d833008b623a Mon Sep 17 00:00:00 2001 From: Ingo Franzki Date: Thu, 4 Jun 2020 10:02:40 +0200 Subject: [PATCH] zkey: Fix -Wmaybe-uninitialized warnings in zkey-cryptsetup.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ingo Franzki Signed-off-by: Jan Höppner --- zkey/zkey-cryptsetup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/zkey/zkey-cryptsetup.c b/zkey/zkey-cryptsetup.c index 24c01261..e3c4eea3 100644 --- a/zkey/zkey-cryptsetup.c +++ b/zkey/zkey-cryptsetup.c @@ -650,10 +650,10 @@ static int get_password_file(char **pwd, size_t *pwd_size, const char *key_file, size_t file_read_size; int regular_file = 0; int char_to_read = 0; + size_t buflen = 0, i; int fd, rc, newline; char *pass = NULL; int char_read = 0; - size_t buflen, i; struct stat sb; fd = key_file ? open(key_file, O_RDONLY) : STDIN_FILENO; @@ -712,6 +712,7 @@ static int get_password_file(char **pwd, size_t *pwd_size, const char *key_file, if (keyfile_offset && keyfile_seek(fd, keyfile_offset) < 0) { warnx("Cannot seek to requested key file offset %lu", keyfile_offset); + rc = -EIO; goto out_err; }