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

Remove unnecessary goto from LUKS2_hdr_version_unlocked.

Browse Source
This commit is contained in:
Milan Broz
2021-02-12 11:01:40 +01:00
parent 2e4a3a9888
commit f6e2fbb366
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/luks2/luks2_disk_metadata.c
View File

@@ -786,14 +786,11 @@ int LUKS2_hdr_version_unlocked(struct crypt_device *cd, const char *backup_file)
flags |= O_DIRECT; flags |= O_DIRECT;
devfd = open(device_path(device), flags); devfd = open(device_path(device), flags);
if (devfd < 0) if (devfd != -1 && (read_lseek_blockwise(devfd, device_block_size(cd, device),
goto err;
if ((read_lseek_blockwise(devfd, device_block_size(cd, device),
device_alignment(device), &hdr, sizeof(hdr), 0) == sizeof(hdr)) && device_alignment(device), &hdr, sizeof(hdr), 0) == sizeof(hdr)) &&
!memcmp(hdr.magic, LUKS2_MAGIC_1ST, LUKS2_MAGIC_L)) !memcmp(hdr.magic, LUKS2_MAGIC_1ST, LUKS2_MAGIC_L))
r = (int)be16_to_cpu(hdr.version); r = (int)be16_to_cpu(hdr.version);
err:
if (devfd != -1) if (devfd != -1)
close(devfd); close(devfd);