dh/ima-evm-utils-mirror
1
0
Fork 0
mirror of https://git.code.sf.net/p/linux-ima/ima-evm-utils synced 2025-04-29 15:13:38 +02:00
Code Releases Activity

ima-evm-utils: Fix clang warning about possible unaligned pointer for hdr->keyid

Browse Source 
Struct signature_v2_hdr is packed so clang complains that taking address
of packed member may result in an unaligned pointer value:

libimaevm.c:481:21: warning: taking address of packed member 'keyid' of class or structure 'signature_v2_hdr' may result in an unaligned pointer value
      [-Waddress-of-packed-member]
                                __be32_to_cpup(&hdr->keyid));
                                                ^~~~~~~~~~

libimaevm.c:905:17: warning: taking address of packed member 'keyid' of class or structure 'signature_v2_hdr' may result in an unaligned pointer value
      [-Waddress-of-packed-member]
        calc_keyid_v2(&hdr->keyid, name, pkey);
                       ^~~~~~~~~~

Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
This commit is contained in:
Vitaly Chikunov 2019-07-08 02:48:37 +03:00 committed by Mimi Zohar
parent ae57a3e1e4
commit 40c842ace3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libimaevm.c
View File

@ -475,10 +475,12 @@ int verify_hash_v2(const char *file, const unsigned char *hash, int size,
} }
if (public_keys) { if (public_keys) {
pkey = find_keyid(hdr->keyid); uint32_t keyid = hdr->keyid;
pkey = find_keyid(keyid);
if (!pkey) { if (!pkey) {
log_err("%s: unknown keyid: %x\n", file, log_err("%s: unknown keyid: %x\n", file,
__be32_to_cpup(&hdr->keyid)); __be32_to_cpup(&keyid));
return -1; return -1;
} }
} else { } else {
@ -869,6 +871,7 @@ int sign_hash_v2(const char *algo, const unsigned char *hash, int size, const ch
const EVP_MD *md; const EVP_MD *md;
size_t sigsize; size_t sigsize;
const char *st; const char *st;
uint32_t keyid;
if (!hash) { if (!hash) {
log_err("sign_hash_v2: hash is null\n"); log_err("sign_hash_v2: hash is null\n");
@ -902,7 +905,8 @@ int sign_hash_v2(const char *algo, const unsigned char *hash, int size, const ch
hdr->hash_algo = get_hash_algo(algo); hdr->hash_algo = get_hash_algo(algo);
calc_keyid_v2(&hdr->keyid, name, pkey); calc_keyid_v2(&keyid, name, pkey);
hdr->keyid = keyid;
st = "EVP_PKEY_CTX_new"; st = "EVP_PKEY_CTX_new";
if (!(ctx = EVP_PKEY_CTX_new(pkey, NULL))) if (!(ctx = EVP_PKEY_CTX_new(pkey, NULL)))