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

Fix displaying of error messages for mising kernel features.

Browse Source
This commit is contained in:
Milan Broz
2013-01-08 14:19:31 +01:00
parent 5f222517f0
commit 929dc47be4
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/loopaes/loopaes.c
View File

@@ -228,7 +228,7 @@ int LOOPAES_activate(struct crypt_device *cd,
r = dm_create_device(cd, name, CRYPT_LOOPAES, &dmd, 0); r = dm_create_device(cd, name, CRYPT_LOOPAES, &dmd, 0);
if (!r && !(dm_flags() & req_flags)) { if (r < 0 && !(dm_flags() & req_flags)) {
log_err(cd, _("Kernel doesn't support loop-AES compatible mapping.\n")); log_err(cd, _("Kernel doesn't support loop-AES compatible mapping.\n"));
r = -ENOTSUP; r = -ENOTSUP;
} }

2
lib/tcrypt/tcrypt.c
View File

@@ -716,7 +716,7 @@ int TCRYPT_activate(struct crypt_device *cd,
break; break;
} }
if (!r && !(dm_flags() & DM_PLAIN64_SUPPORTED)) { if (r < 0 && !(dm_flags() & DM_PLAIN64_SUPPORTED)) {
log_err(cd, _("Kernel doesn't support plain64 IV.\n")); log_err(cd, _("Kernel doesn't support plain64 IV.\n"));
r = -ENOTSUP; r = -ENOTSUP;
} }

2
lib/verity/verity.c
View File

@@ -272,7 +272,7 @@ int VERITY_activate(struct crypt_device *cd,
return r; return r;
r = dm_create_device(cd, name, CRYPT_VERITY, &dmd, 0); r = dm_create_device(cd, name, CRYPT_VERITY, &dmd, 0);
if (!r && !(dm_flags() & DM_VERITY_SUPPORTED)) { if (r < 0 && !(dm_flags() & DM_VERITY_SUPPORTED)) {
log_err(cd, _("Kernel doesn't support dm-verity mapping.\n")); log_err(cd, _("Kernel doesn't support dm-verity mapping.\n"));
return -ENOTSUP; return -ENOTSUP;
} }

1
tests/verity-compat-test
View File

@@ -149,6 +149,7 @@ function valgrind_run()
[ -n "$VALG" ] && valgrind_setup && VERITYSETUP=valgrind_run [ -n "$VALG" ] && valgrind_setup && VERITYSETUP=valgrind_run
modprobe dm-verity >/dev/null 2>&1 modprobe dm-verity >/dev/null 2>&1
dmsetup targets | grep verity >/dev/null 2>&1 || skip "Cannot find dm-verity target, test skipped."
# VERITYSETUP tests # VERITYSETUP tests