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

Fix access to devices under non-root user.

Browse Source 
We cannot allocate loop device early in luksFormat,
use only device access check here.
This commit is contained in:
Milan Broz
2017-06-28 14:24:39 +02:00
parent fdd6794ce3
commit 29681c0aa7
3 changed files with 68 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/setup.c
View File

@@ -1042,7 +1042,7 @@ static int _crypt_format_luks1(struct crypt_device *cd,
if (r < 0)
return r;
r = device_block_adjust(cd, crypt_metadata_device(cd), DEV_EXCL, 0, NULL, NULL);
r = device_check_access(cd, crypt_metadata_device(cd), DEV_EXCL);
if (r < 0)
return r;
@@ -1235,7 +1235,7 @@ static int _crypt_format_integrity(struct crypt_device *cd,
return -EINVAL;
}
r = device_block_adjust(cd, crypt_metadata_device(cd), DEV_EXCL, 0, NULL, NULL);
r = device_check_access(cd, crypt_metadata_device(cd), DEV_EXCL);
if (r < 0)
return r;