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

Fix a gcc warning when accessing packed struct member.

Browse Source
This commit is contained in:
Milan Broz
2019-03-05 16:50:24 +01:00
parent d85c7d06af
commit c9347d3d7d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/tcrypt/tcrypt.c
View File

@@ -920,9 +920,10 @@ out:
}
static int TCRYPT_status_one(struct crypt_device *cd, const char *name,
const char *base_uuid, int index,
size_t *key_size, char *cipher,
uint64_t *data_offset, struct device **device)
const char *base_uuid, int index,
size_t *key_size, char *cipher,
struct tcrypt_phdr *tcrypt_hdr,
struct device **device)
{
struct crypt_dm_active_device dmd;
struct dm_target *tgt = &dmd.segment;
@@ -955,7 +956,7 @@ static int TCRYPT_status_one(struct crypt_device *cd, const char *name,
strcat(cipher, "-");
strncat(cipher, tgt->u.crypt.cipher, MAX_CIPHER_LEN);
*key_size += tgt->u.crypt.vk->keylength;
*data_offset = tgt->u.crypt.offset * SECTOR_SIZE;
tcrypt_hdr->d.mk_offset = tgt->u.crypt.offset * SECTOR_SIZE;
device_free(cd, *device);
MOVE_REF(*device, tgt->data_device);
} else
@@ -993,10 +994,10 @@ int TCRYPT_init_by_name(struct crypt_device *cd, const char *name,
key_size = tgt->u.crypt.vk->keylength;
r = TCRYPT_status_one(cd, name, uuid, 1, &key_size,
cipher, &tcrypt_hdr->d.mk_offset, device);
cipher, tcrypt_hdr, device);
if (!r)
r = TCRYPT_status_one(cd, name, uuid, 2, &key_size,
cipher, &tcrypt_hdr->d.mk_offset, device);
cipher, tcrypt_hdr, device);
if (r < 0 && r != -ENODEV)
return r;