mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 18:23:57 -06:00
pull: crypto and io queue
* Many LUKS header robustness checks * Fix TLS PSK error reporting * Enable LUKS creation on macOS * Report useful errnos from seccomp * I/O chanel Windows portability fix -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE2vOm/bJrYpEtDo4/vobrtBUQT98FAmNawAcACgkQvobrtBUQ T9/pWA/9FXE6kvkv9YQhb/h1rMALO1aLKqUG/jWKP/mzqqLpDKHxxPin/nw8RYff xyHt5mC7t1g7a8FFMlXxFHw1WE9o46j3tQg2IokWlX2ossYaZQx+BVv4s1zjTxcK KPVKWoEqN5sfa2T7gUGbfZ+dH9LSZ29DRT+GrO9YEvjdSg0yUKHXPetjw6iw5OVT GuI22xOVKbuCBf7PW/nvUe/6prxAfc7IavvAusrdkMFXymcys87q7ZCxGYEsDxyC vUkLdAoB9kcjwvmU+sZl9WhjasRQkUxW8zCToKea4TSS1fp5pgVL0TT4x7yq7ts4 nqnaqiSTBfRda62lF64A9lM91K7hbDqPC33FkCNKWJGsQAYIFvdVJdqJsvZHUr1/ 3KyHkXMsyzRfGnT7MHK+GpwcgvTupBP8ceiyYq28CLNAKXpXb6vmJIsIAdF3UaYi N320ogiU3iRmkqdbbbGTpBB40UQvQvdbmqKTTDmigLdpDL2TLzAqfpu1zepg+7xE wcXoPM9ZcRSwM7i9QyPMtjharCTeVR/QPlUN9agDGOlzNpUahIC5YrmCVKXNunnE M259Ytyb6ymaMrsHgshW1gJP3327N/lIOp5yLLHEzgLM1xAGOaDP83FsF8JA/Zsd f1he75N3KbDPYhgrdfFfitcO8F8zvhK3AqyqNDPCpJKVSeKKqFE= =qrzm -----END PGP SIGNATURE----- Merge tag 'misc-next-pull-request' of https://gitlab.com/berrange/qemu into staging pull: crypto and io queue * Many LUKS header robustness checks * Fix TLS PSK error reporting * Enable LUKS creation on macOS * Report useful errnos from seccomp * I/O chanel Windows portability fix # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE2vOm/bJrYpEtDo4/vobrtBUQT98FAmNawAcACgkQvobrtBUQ # T9/pWA/9FXE6kvkv9YQhb/h1rMALO1aLKqUG/jWKP/mzqqLpDKHxxPin/nw8RYff # xyHt5mC7t1g7a8FFMlXxFHw1WE9o46j3tQg2IokWlX2ossYaZQx+BVv4s1zjTxcK # KPVKWoEqN5sfa2T7gUGbfZ+dH9LSZ29DRT+GrO9YEvjdSg0yUKHXPetjw6iw5OVT # GuI22xOVKbuCBf7PW/nvUe/6prxAfc7IavvAusrdkMFXymcys87q7ZCxGYEsDxyC # vUkLdAoB9kcjwvmU+sZl9WhjasRQkUxW8zCToKea4TSS1fp5pgVL0TT4x7yq7ts4 # nqnaqiSTBfRda62lF64A9lM91K7hbDqPC33FkCNKWJGsQAYIFvdVJdqJsvZHUr1/ # 3KyHkXMsyzRfGnT7MHK+GpwcgvTupBP8ceiyYq28CLNAKXpXb6vmJIsIAdF3UaYi # N320ogiU3iRmkqdbbbGTpBB40UQvQvdbmqKTTDmigLdpDL2TLzAqfpu1zepg+7xE # wcXoPM9ZcRSwM7i9QyPMtjharCTeVR/QPlUN9agDGOlzNpUahIC5YrmCVKXNunnE # M259Ytyb6ymaMrsHgshW1gJP3327N/lIOp5yLLHEzgLM1xAGOaDP83FsF8JA/Zsd # f1he75N3KbDPYhgrdfFfitcO8F8zvhK3AqyqNDPCpJKVSeKKqFE= # =qrzm # -----END PGP SIGNATURE----- # gpg: Signature made Thu 27 Oct 2022 13:29:43 EDT # gpg: using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full] # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" [full] # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * tag 'misc-next-pull-request' of https://gitlab.com/berrange/qemu: crypto: add test cases for many malformed LUKS header scenarios crypto: ensure LUKS tests run with GNUTLS crypto provider crypto: quote algorithm names in error messages crypto: split off helpers for converting LUKS header endianess crypto: split LUKS header definitions off into file crypto: check that LUKS PBKDF2 iterations count is non-zero crypto: strengthen the check for key slots overlapping with LUKS header crypto: validate that LUKS payload doesn't overlap with header crypto: enforce that key material doesn't overlap with LUKS header crypto: enforce that LUKS stripes is always a fixed value crypto: sanity check that LUKS header strings are NUL-terminated tests: avoid DOS line endings in PSK file crypto: check for and report errors setting PSK credentials scripts: check if .git exists before checking submodule status seccomp: Get actual errno value from failed seccomp functions io/channel-watch: Fix socket watch on Windows io/channel-watch: Drop the unnecessary cast io/channel-watch: Drop a superfluous '#ifdef WIN32' util/qemu-sockets: Use g_get_tmp_dir() to get the directory for temporary files crypto/luks: Support creating LUKS image on Darwin Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
commit
a8183c3468
11 changed files with 616 additions and 158 deletions
|
|
@ -27,15 +27,14 @@
|
|||
static void
|
||||
test_tls_psk_init_common(const char *pskfile, const char *user, const char *key)
|
||||
{
|
||||
FILE *fp;
|
||||
g_autoptr(GError) gerr = NULL;
|
||||
g_autofree char *line = g_strdup_printf("%s:%s\n", user, key);
|
||||
|
||||
fp = fopen(pskfile, "w");
|
||||
if (fp == NULL) {
|
||||
g_critical("Failed to create pskfile %s: %s", pskfile, strerror(errno));
|
||||
g_file_set_contents(pskfile, line, strlen(line), &gerr);
|
||||
if (gerr != NULL) {
|
||||
g_critical("Failed to create pskfile %s: %s", pskfile, gerr->message);
|
||||
abort();
|
||||
}
|
||||
fprintf(fp, "%s:%s\n", user, key);
|
||||
fclose(fp);
|
||||
}
|
||||
|
||||
void test_tls_psk_init(const char *pskfile)
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
#include "qapi/error.h"
|
||||
#include "crypto/init.h"
|
||||
#include "crypto/block.h"
|
||||
#include "crypto/block-luks-priv.h"
|
||||
#include "qemu/buffer.h"
|
||||
#include "qemu/module.h"
|
||||
#include "crypto/secret.h"
|
||||
|
|
@ -30,7 +31,8 @@
|
|||
#endif
|
||||
|
||||
#if (defined(_WIN32) || defined RUSAGE_THREAD) && \
|
||||
(defined(CONFIG_NETTLE) || defined(CONFIG_GCRYPT))
|
||||
(defined(CONFIG_NETTLE) || defined(CONFIG_GCRYPT) || \
|
||||
defined(CONFIG_GNUTLS_CRYPTO))
|
||||
#define TEST_LUKS
|
||||
#else
|
||||
#undef TEST_LUKS
|
||||
|
|
@ -344,6 +346,230 @@ static void test_block(gconstpointer opaque)
|
|||
}
|
||||
|
||||
|
||||
#ifdef TEST_LUKS
|
||||
typedef const char *(*LuksHeaderDoBadStuff)(QCryptoBlockLUKSHeader *hdr);
|
||||
|
||||
static void
|
||||
test_luks_bad_header(gconstpointer data)
|
||||
{
|
||||
LuksHeaderDoBadStuff badstuff = data;
|
||||
QCryptoBlock *blk;
|
||||
Buffer buf;
|
||||
Object *sec = test_block_secret();
|
||||
QCryptoBlockLUKSHeader hdr;
|
||||
Error *err = NULL;
|
||||
const char *msg;
|
||||
|
||||
memset(&buf, 0, sizeof(buf));
|
||||
buffer_init(&buf, "header");
|
||||
|
||||
/* Correctly create the volume initially */
|
||||
blk = qcrypto_block_create(&luks_create_opts_default, NULL,
|
||||
test_block_init_func,
|
||||
test_block_write_func,
|
||||
&buf,
|
||||
&error_abort);
|
||||
g_assert(blk);
|
||||
|
||||
qcrypto_block_free(blk);
|
||||
|
||||
/* Mangle it in some unpleasant way */
|
||||
g_assert(buf.offset >= sizeof(hdr));
|
||||
memcpy(&hdr, buf.buffer, sizeof(hdr));
|
||||
qcrypto_block_luks_to_disk_endian(&hdr);
|
||||
|
||||
msg = badstuff(&hdr);
|
||||
|
||||
qcrypto_block_luks_from_disk_endian(&hdr);
|
||||
memcpy(buf.buffer, &hdr, sizeof(hdr));
|
||||
|
||||
/* Check that we fail to open it again */
|
||||
blk = qcrypto_block_open(&luks_open_opts, NULL,
|
||||
test_block_read_func,
|
||||
&buf,
|
||||
0,
|
||||
1,
|
||||
&err);
|
||||
g_assert(!blk);
|
||||
g_assert(err);
|
||||
|
||||
g_assert_cmpstr(error_get_pretty(err), ==, msg);
|
||||
error_free(err);
|
||||
|
||||
object_unparent(sec);
|
||||
|
||||
buffer_free(&buf);
|
||||
}
|
||||
|
||||
static const char *luks_bad_null_term_cipher_name(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
/* Replace NUL termination with spaces */
|
||||
char *offset = hdr->cipher_name + strlen(hdr->cipher_name);
|
||||
memset(offset, ' ', sizeof(hdr->cipher_name) - (offset - hdr->cipher_name));
|
||||
|
||||
return "LUKS header cipher name is not NUL terminated";
|
||||
}
|
||||
|
||||
static const char *luks_bad_null_term_cipher_mode(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
/* Replace NUL termination with spaces */
|
||||
char *offset = hdr->cipher_mode + strlen(hdr->cipher_mode);
|
||||
memset(offset, ' ', sizeof(hdr->cipher_mode) - (offset - hdr->cipher_mode));
|
||||
|
||||
return "LUKS header cipher mode is not NUL terminated";
|
||||
}
|
||||
|
||||
static const char *luks_bad_null_term_hash_spec(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
/* Replace NUL termination with spaces */
|
||||
char *offset = hdr->hash_spec + strlen(hdr->hash_spec);
|
||||
memset(offset, ' ', sizeof(hdr->hash_spec) - (offset - hdr->hash_spec));
|
||||
|
||||
return "LUKS header hash spec is not NUL terminated";
|
||||
}
|
||||
|
||||
static const char *luks_bad_cipher_name_empty(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->cipher_name, "", 1);
|
||||
|
||||
return "Algorithm '' with key size 32 bytes not supported";
|
||||
}
|
||||
|
||||
static const char *luks_bad_cipher_name_unknown(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->cipher_name, "aess", 5);
|
||||
|
||||
return "Algorithm 'aess' with key size 32 bytes not supported";
|
||||
}
|
||||
|
||||
static const char *luks_bad_cipher_xts_size(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
hdr->master_key_len = 33;
|
||||
|
||||
return "XTS cipher key length should be a multiple of 2";
|
||||
}
|
||||
|
||||
static const char *luks_bad_cipher_cbc_size(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
hdr->master_key_len = 33;
|
||||
memcpy(hdr->cipher_mode, "cbc-essiv", 10);
|
||||
|
||||
return "Algorithm 'aes' with key size 33 bytes not supported";
|
||||
}
|
||||
|
||||
static const char *luks_bad_cipher_mode_empty(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->cipher_mode, "", 1);
|
||||
|
||||
return "Unexpected cipher mode string format ''";
|
||||
}
|
||||
|
||||
static const char *luks_bad_cipher_mode_unknown(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->cipher_mode, "xfs", 4);
|
||||
|
||||
return "Unexpected cipher mode string format 'xfs'";
|
||||
}
|
||||
|
||||
static const char *luks_bad_ivgen_separator(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->cipher_mode, "xts:plain64", 12);
|
||||
|
||||
return "Unexpected cipher mode string format 'xts:plain64'";
|
||||
}
|
||||
|
||||
static const char *luks_bad_ivgen_name_empty(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->cipher_mode, "xts-", 5);
|
||||
|
||||
return "IV generator '' not supported";
|
||||
}
|
||||
|
||||
static const char *luks_bad_ivgen_name_unknown(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->cipher_mode, "xts-plain65", 12);
|
||||
|
||||
return "IV generator 'plain65' not supported";
|
||||
}
|
||||
|
||||
static const char *luks_bad_ivgen_hash_empty(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->cipher_mode, "xts-plain65:", 13);
|
||||
|
||||
return "Hash algorithm '' not supported";
|
||||
}
|
||||
|
||||
static const char *luks_bad_ivgen_hash_unknown(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->cipher_mode, "xts-plain65:sha257", 19);
|
||||
|
||||
return "Hash algorithm 'sha257' not supported";
|
||||
}
|
||||
|
||||
static const char *luks_bad_hash_spec_empty(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->hash_spec, "", 1);
|
||||
|
||||
return "Hash algorithm '' not supported";
|
||||
}
|
||||
|
||||
static const char *luks_bad_hash_spec_unknown(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
memcpy(hdr->hash_spec, "sha2566", 8);
|
||||
|
||||
return "Hash algorithm 'sha2566' not supported";
|
||||
}
|
||||
|
||||
static const char *luks_bad_stripes(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
hdr->key_slots[0].stripes = 3999;
|
||||
|
||||
return "Keyslot 0 is corrupted (stripes 3999 != 4000)";
|
||||
}
|
||||
|
||||
static const char *luks_bad_key_overlap_header(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
hdr->key_slots[0].key_offset_sector = 2;
|
||||
|
||||
return "Keyslot 0 is overlapping with the LUKS header";
|
||||
}
|
||||
|
||||
static const char *luks_bad_key_overlap_key(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
hdr->key_slots[0].key_offset_sector = hdr->key_slots[1].key_offset_sector;
|
||||
|
||||
return "Keyslots 0 and 1 are overlapping in the header";
|
||||
}
|
||||
|
||||
static const char *luks_bad_key_overlap_payload(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
hdr->key_slots[0].key_offset_sector = hdr->payload_offset_sector + 42;
|
||||
|
||||
return "Keyslot 0 is overlapping with the encrypted payload";
|
||||
}
|
||||
|
||||
static const char *luks_bad_payload_overlap_header(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
hdr->payload_offset_sector = 2;
|
||||
|
||||
return "LUKS payload is overlapping with the header";
|
||||
}
|
||||
|
||||
static const char *luks_bad_key_iterations(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
hdr->key_slots[0].iterations = 0;
|
||||
|
||||
return "Keyslot 0 iteration count is zero";
|
||||
}
|
||||
|
||||
static const char *luks_bad_iterations(QCryptoBlockLUKSHeader *hdr)
|
||||
{
|
||||
hdr->master_key_iterations = 0;
|
||||
|
||||
return "LUKS key iteration count is zero";
|
||||
}
|
||||
#endif
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
gsize i;
|
||||
|
|
@ -364,5 +590,79 @@ int main(int argc, char **argv)
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef TEST_LUKS
|
||||
if (g_test_slow()) {
|
||||
g_test_add_data_func("/crypto/block/luks/bad/cipher-name-nul-term",
|
||||
luks_bad_null_term_cipher_name,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/cipher-mode-nul-term",
|
||||
luks_bad_null_term_cipher_mode,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/hash-spec-nul-term",
|
||||
luks_bad_null_term_hash_spec,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/cipher-name-empty",
|
||||
luks_bad_cipher_name_empty,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/cipher-name-unknown",
|
||||
luks_bad_cipher_name_unknown,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/cipher-xts-size",
|
||||
luks_bad_cipher_xts_size,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/cipher-cbc-size",
|
||||
luks_bad_cipher_cbc_size,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/cipher-mode-empty",
|
||||
luks_bad_cipher_mode_empty,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/cipher-mode-unknown",
|
||||
luks_bad_cipher_mode_unknown,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/ivgen-separator",
|
||||
luks_bad_ivgen_separator,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/ivgen-name-empty",
|
||||
luks_bad_ivgen_name_empty,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/ivgen-name-unknown",
|
||||
luks_bad_ivgen_name_unknown,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/ivgen-hash-empty",
|
||||
luks_bad_ivgen_hash_empty,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/ivgen-hash-unknown",
|
||||
luks_bad_ivgen_hash_unknown,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/hash-spec-empty",
|
||||
luks_bad_hash_spec_empty,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/hash-spec-unknown",
|
||||
luks_bad_hash_spec_unknown,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/stripes",
|
||||
luks_bad_stripes,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/key-overlap-header",
|
||||
luks_bad_key_overlap_header,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/key-overlap-key",
|
||||
luks_bad_key_overlap_key,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/key-overlap-payload",
|
||||
luks_bad_key_overlap_payload,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/payload-overlap-header",
|
||||
luks_bad_payload_overlap_header,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/iterations",
|
||||
luks_bad_iterations,
|
||||
test_luks_bad_header);
|
||||
g_test_add_data_func("/crypto/block/luks/bad/key-iterations",
|
||||
luks_bad_key_iterations,
|
||||
test_luks_bad_header);
|
||||
}
|
||||
#endif
|
||||
|
||||
return g_test_run();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue