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 disk wipe (during keyslot removal) if used on 4k hw block device.

Browse Source 
The "Gutmann" metod uses various offset, direct-io need
to even read device when working with buffer...

Fixes Issue 129.
This commit is contained in:
Milan Broz
2012-05-09 21:57:50 +02:00
parent f8aa0bc084
commit 490c17b3cd
3 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,3 +1,6 @@
2012-05-09 Milan Broz <gmazyland@gmail.com>
* Fix keyslot removal (wipe keyslot) for device with 4k hw block (1.4.0).
2012-05-02 Milan Broz <gmazyland@gmail.com> 2012-05-02 Milan Broz <gmazyland@gmail.com>
* Fix loop mapping on readonly file. * Fix loop mapping on readonly file.
* Relax --shared test, allow mapping even for overlapping segments. * Relax --shared test, allow mapping even for overlapping segments.

2
lib/utils_wipe.c
View File

@@ -133,7 +133,7 @@ int crypt_wipe(const char *device,
if (!buffer) if (!buffer)
return -ENOMEM; return -ENOMEM;
flags = O_WRONLY | O_DIRECT | O_SYNC; flags = O_RDWR | O_DIRECT | O_SYNC;
/* use O_EXCL only for block devices */ /* use O_EXCL only for block devices */
if (exclusive && S_ISBLK(st.st_mode)) if (exclusive && S_ISBLK(st.st_mode))

13
tests/align-test
View File

@@ -58,6 +58,19 @@ format() # key_bits expected [forced]
echo "FAIL" echo "FAIL"
fail "Expected alignment differs: expected $2 != detected $ALIGN" fail "Expected alignment differs: expected $2 != detected $ALIGN"
fi fi
# test some operation, just in case
echo -e "xxx\naaa" | $CRYPTSETUP luksAddKey $DEV -i1 --key-slot 1
if [ $? -ne 0 ] ; then
echo "FAIL"
fail "Keyslot add failed."
fi
$CRYPTSETUP -q luksKillSlot $DEV 1
if [ $? -ne 0 ] ; then
echo "FAIL"
fail "Keyslot removal failed."
fi
echo "PASSED" echo "PASSED"
} }