SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cryptsetup: make sure to return EAGAIN on wrong tcrypt password too

Browse Source 
Only then we'll try again to ask the user for a password.

Fixes: #12152
This commit is contained in:
Lennart Poettering
2020-05-19 17:28:29 +02:00
parent 7407f68980
commit cb6c9283b5
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/cryptsetup/cryptsetup.c
+4 -6
View File
@@ -512,15 +512,13 @@ static int attach_tcrypt(
r = crypt_load(cd, CRYPT_TCRYPT, &params);
if (r < 0) {
if (r == -EPERM) {
if (key_data) {
if (key_data)
log_error_errno(r, "Failed to activate using discovered key. (Key not correct?)");
return -EAGAIN; /* log the actual error, but return EAGAIN */
}
if (key_file) {
if (key_file)
log_error_errno(r, "Failed to activate using password file '%s'. (Key data not correct?)", key_file);
return -EAGAIN; /* log the actual error, but return EAGAIN */
}
return -EAGAIN; /* log the actual error, but return EAGAIN */
}
return log_error_errno(r, "Failed to load tcrypt superblock on device %s: %m", crypt_get_device_name(cd));