eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 19:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename label in utils for consistency.

Browse Source
This commit is contained in:
Milan Broz
2021-02-12 11:56:01 +01:00
parent 6dd347ddb4
commit f5dd3c8e32
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/utils.c
View File

@@ -171,8 +171,7 @@ int crypt_keyfile_device_read(struct crypt_device *cd, const char *keyfile,
if (isatty(fd)) { if (isatty(fd)) {
log_err(cd, _("Cannot read keyfile from a terminal.")); log_err(cd, _("Cannot read keyfile from a terminal."));
r = -EINVAL; goto out;
goto out_err;
} }
/* If not requested otherwise, we limit input to prevent memory exhaustion */ /* If not requested otherwise, we limit input to prevent memory exhaustion */
@@ -188,7 +187,7 @@ int crypt_keyfile_device_read(struct crypt_device *cd, const char *keyfile,
if (keyfile) { if (keyfile) {
if (stat(keyfile, &st) < 0) { if (stat(keyfile, &st) < 0) {
log_err(cd, _("Failed to stat key file.")); log_err(cd, _("Failed to stat key file."));
goto out_err; goto out;
} }
if (S_ISREG(st.st_mode)) { if (S_ISREG(st.st_mode)) {
regular_file = 1; regular_file = 1;
@@ -196,7 +195,7 @@ int crypt_keyfile_device_read(struct crypt_device *cd, const char *keyfile,
if (keyfile_offset > file_read_size) { if (keyfile_offset > file_read_size) {
log_err(cd, _("Cannot seek to requested keyfile offset.")); log_err(cd, _("Cannot seek to requested keyfile offset."));
goto out_err; goto out;
} }
file_read_size -= keyfile_offset; file_read_size -= keyfile_offset;
@@ -211,13 +210,13 @@ int crypt_keyfile_device_read(struct crypt_device *cd, const char *keyfile,
pass = crypt_safe_alloc(buflen); pass = crypt_safe_alloc(buflen);
if (!pass) { if (!pass) {
log_err(cd, _("Out of memory while reading passphrase.")); log_err(cd, _("Out of memory while reading passphrase."));
goto out_err; goto out;
} }
/* Discard keyfile_offset bytes on input */ /* Discard keyfile_offset bytes on input */
if (keyfile_offset && keyfile_seek(fd, keyfile_offset) < 0) { if (keyfile_offset && keyfile_seek(fd, keyfile_offset) < 0) {
log_err(cd, _("Cannot seek to requested keyfile offset.")); log_err(cd, _("Cannot seek to requested keyfile offset."));
goto out_err; goto out;
} }
for (i = 0, newline = 0; i < key_size; i += char_read) { for (i = 0, newline = 0; i < key_size; i += char_read) {
@@ -227,7 +226,7 @@ int crypt_keyfile_device_read(struct crypt_device *cd, const char *keyfile,
if (!pass) { if (!pass) {
log_err(cd, _("Out of memory while reading passphrase.")); log_err(cd, _("Out of memory while reading passphrase."));
r = -ENOMEM; r = -ENOMEM;
goto out_err; goto out;
} }
} }
@@ -247,7 +246,7 @@ int crypt_keyfile_device_read(struct crypt_device *cd, const char *keyfile,
if (char_read < 0) { if (char_read < 0) {
log_err(cd, _("Error reading passphrase.")); log_err(cd, _("Error reading passphrase."));
r = -EPIPE; r = -EPIPE;
goto out_err; goto out;
} }
if (char_read == 0) if (char_read == 0)
@@ -264,24 +263,24 @@ int crypt_keyfile_device_read(struct crypt_device *cd, const char *keyfile,
if (!i && !regular_file && !newline) { if (!i && !regular_file && !newline) {
log_err(cd, _("Nothing to read on input.")); log_err(cd, _("Nothing to read on input."));
r = -EPIPE; r = -EPIPE;
goto out_err; goto out;
} }
/* Fail if we exceeded internal default (no specified size) */ /* Fail if we exceeded internal default (no specified size) */
if (unlimited_read && i == key_size) { if (unlimited_read && i == key_size) {
log_err(cd, _("Maximum keyfile size exceeded.")); log_err(cd, _("Maximum keyfile size exceeded."));
goto out_err; goto out;
} }
if (!unlimited_read && i != key_size) { if (!unlimited_read && i != key_size) {
log_err(cd, _("Cannot read requested amount of data.")); log_err(cd, _("Cannot read requested amount of data."));
goto out_err; goto out;
} }
*key = pass; *key = pass;
*key_size_read = i; *key_size_read = i;
r = 0; r = 0;
out_err: out:
if (fd != STDIN_FILENO) if (fd != STDIN_FILENO)
close(fd); close(fd);