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

Fix status of device if path argument is used. Fix double path prefix for non-existent device path.

Browse Source
This commit is contained in:
Milan Broz
2012-12-30 11:33:24 +01:00
parent 90853cc3ab
commit 0946c704bf
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libdevmapper.c
View File

@@ -696,6 +696,14 @@ int dm_status_device(struct crypt_device *cd, const char *name)
{ {
int r; int r;
struct dm_info dmi; struct dm_info dmi;
struct stat st;
/* libdevmapper is too clever and handles
* path argument differenly with error.
* Fail early here if parameter is non-existent path.
*/
if (strchr(name, '/') && stat(name, &st) < 0)
return -ENODEV;
if (dm_init_context(cd)) if (dm_init_context(cd))
return -ENOTSUP; return -ENOTSUP;

3
src/cryptsetup.c
View File

@@ -374,13 +374,12 @@ static int action_status(void)
crypt_status_info ci; crypt_status_info ci;
struct crypt_active_device cad; struct crypt_active_device cad;
struct crypt_device *cd = NULL; struct crypt_device *cd = NULL;
struct stat st;
char *backing_file; char *backing_file;
const char *device; const char *device;
int path = 0, r = 0; int path = 0, r = 0;
/* perhaps a path, not a dm device name */ /* perhaps a path, not a dm device name */
if (strchr(action_argv[0], '/') && !stat(action_argv[0], &st)) if (strchr(action_argv[0], '/'))
path = 1; path = 1;
ci = crypt_status(NULL, action_argv[0]); ci = crypt_status(NULL, action_argv[0]);

2
tests/tcrypt-compat-test
View File

@@ -97,6 +97,8 @@ echo "ACTIVATION FS UUID CHECK (LRW/XTS modes only)"
for file in $(ls $TST_DIR/tc_*-lrw-* $TST_DIR/tc_*-xts-*) ; do for file in $(ls $TST_DIR/tc_*-lrw-* $TST_DIR/tc_*-xts-*) ; do
echo -n " $file" echo -n " $file"
echo $PASSWORD | $CRYPTSETUP tcryptOpen -r $file $MAP || fail echo $PASSWORD | $CRYPTSETUP tcryptOpen -r $file $MAP || fail
$CRYPTSETUP status $MAP >/dev/null || fail
$CRYPTSETUP status /dev/mapper/$MAP >/dev/null || fail
UUID=$(lsblk -n -o UUID /dev/mapper/$MAP) UUID=$(lsblk -n -o UUID /dev/mapper/$MAP)
$CRYPTSETUP remove $MAP || fail $CRYPTSETUP remove $MAP || fail
[ "$UUID" != "DEAD-BABE" ] && fail "UUID check failed." [ "$UUID" != "DEAD-BABE" ] && fail "UUID check failed."