f6f03df49f
When the creds->username property is set we allocate memory
for it in qcrypto_tls_creds_psk_prop_set_username(), but
we never free this when the QCryptoTLSCredsPSK is destroyed.
Free the memory in finalize.
This fixes a LeakSanitizer complaint in migration-test:
$ (cd build/asan; ASAN_OPTIONS="fast_unwind_on_malloc=0" QTEST_QEMU_BINARY=./qemu-system-x86_64 ./tests/qtest/migration-test --tap -k -p /x86_64/migration/precopy/unix/tls/psk)
=================================================================
==3867512==ERROR: LeakSanitizer: detected memory leaks
Direct leak of 5 byte(s) in 1 object(s) allocated from:
#0 0x5624e5c99dee in malloc (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-x86_64+0x218edee) (BuildId: a9e623fa1009a9435c0142c037cd7b8c1ad04ce3)
#1 0x7fb199ae9738 in g_malloc debian/build/deb/../../../glib/gmem.c:128:13
#2 0x7fb199afe583 in g_strdup debian/build/deb/../../../glib/gstrfuncs.c:361:17
#3 0x5624e82ea919 in qcrypto_tls_creds_psk_prop_set_username /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../crypto/tlscredspsk.c:255:23
#4 0x5624e812c6b5 in property_set_str /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../qom/object.c:2277:5
#5 0x5624e8125ce5 in object_property_set /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../qom/object.c:1463:5
#6 0x5624e8136e7c in object_set_properties_from_qdict /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../qom/object_interfaces.c:55:14
#7 0x5624e81372d2 in user_creatable_add_type /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../qom/object_interfaces.c:112:5
#8 0x5624e8137964 in user_creatable_add_qapi /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../qom/object_interfaces.c:157:11
#9 0x5624e891ba3c in qmp_object_add /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../qom/qom-qmp-cmds.c:227:5
#10 0x5624e8af9118 in qmp_marshal_object_add /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qapi/qapi-commands-qom.c:337:5
#11 0x5624e8bd1d49 in do_qmp_dispatch_bh /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../qapi/qmp-dispatch.c:128:5
#12 0x5624e8cb2531 in aio_bh_call /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../util/async.c:171:5
#13 0x5624e8cb340c in aio_bh_poll /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../util/async.c:218:13
#14 0x5624e8c0be98 in aio_dispatch /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../util/aio-posix.c:423:5
#15 0x5624e8cba3ce in aio_ctx_dispatch /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../util/async.c:360:5
#16 0x7fb199ae0d3a in g_main_dispatch debian/build/deb/../../../glib/gmain.c:3419:28
#17 0x7fb199ae0d3a in g_main_context_dispatch debian/build/deb/../../../glib/gmain.c:4137:7
#18 0x5624e8cbe1d9 in glib_pollfds_poll /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../util/main-loop.c:287:9
#19 0x5624e8cbcb13 in os_host_main_loop_wait /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../util/main-loop.c:310:5
#20 0x5624e8cbc6dc in main_loop_wait /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../util/main-loop.c:589:11
#21 0x5624e6f3f917 in qemu_main_loop /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../system/runstate.c:801:9
#22 0x5624e893379c in qemu_default_main /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../system/main.c:37:14
#23 0x5624e89337e7 in main /mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/../../system/main.c:48:12
#24 0x7fb197972d8f in __libc_start_call_main csu/../sysdeps/nptl/libc_start_call_main.h:58:16
#25 0x7fb197972e3f in __libc_start_main csu/../csu/libc-start.c:392:3
#26 0x5624e5c16fa4 in _start (/mnt/nvmedisk/linaro/qemu-from-laptop/qemu/build/asan/qemu-system-x86_64+0x210bfa4) (BuildId: a9e623fa1009a9435c0142c037cd7b8c1ad04ce3)
SUMMARY: AddressSanitizer: 5 byte(s) leaked in 1 allocation(s).
Cc: qemu-stable@nongnu.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240819145021.38524-1-peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
(cherry picked from commit 87e012f29f
)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
307 lines
8.5 KiB
C
307 lines
8.5 KiB
C
/*
|
|
* QEMU crypto TLS Pre-Shared Keys (PSK) support
|
|
*
|
|
* Copyright (c) 2018 Red Hat, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "crypto/tlscredspsk.h"
|
|
#include "tlscredspriv.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "qom/object_interfaces.h"
|
|
#include "trace.h"
|
|
|
|
|
|
#ifdef CONFIG_GNUTLS
|
|
|
|
#include <gnutls/gnutls.h>
|
|
|
|
static int
|
|
lookup_key(const char *pskfile, const char *username, gnutls_datum_t *key,
|
|
Error **errp)
|
|
{
|
|
const size_t ulen = strlen(username);
|
|
GError *gerr = NULL;
|
|
char *content = NULL;
|
|
char **lines = NULL;
|
|
size_t clen = 0, i;
|
|
int ret = -1;
|
|
|
|
if (!g_file_get_contents(pskfile, &content, &clen, &gerr)) {
|
|
error_setg(errp, "Cannot read PSK file %s: %s",
|
|
pskfile, gerr->message);
|
|
g_error_free(gerr);
|
|
return -1;
|
|
}
|
|
|
|
lines = g_strsplit(content, "\n", -1);
|
|
for (i = 0; lines[i] != NULL; ++i) {
|
|
if (strncmp(lines[i], username, ulen) == 0 && lines[i][ulen] == ':') {
|
|
key->data = (unsigned char *) g_strdup(&lines[i][ulen + 1]);
|
|
key->size = strlen(lines[i]) - ulen - 1;
|
|
ret = 0;
|
|
goto out;
|
|
}
|
|
}
|
|
error_setg(errp, "Username %s not found in PSK file %s",
|
|
username, pskfile);
|
|
|
|
out:
|
|
free(content);
|
|
g_strfreev(lines);
|
|
return ret;
|
|
}
|
|
|
|
static int
|
|
qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *creds,
|
|
Error **errp)
|
|
{
|
|
g_autofree char *pskfile = NULL;
|
|
g_autofree char *dhparams = NULL;
|
|
const char *username;
|
|
int ret;
|
|
int rv = -1;
|
|
gnutls_datum_t key = { .data = NULL };
|
|
|
|
trace_qcrypto_tls_creds_psk_load(creds,
|
|
creds->parent_obj.dir ? creds->parent_obj.dir : "<nodir>");
|
|
|
|
if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
|
|
if (creds->username) {
|
|
error_setg(errp, "username should not be set when endpoint=server");
|
|
goto cleanup;
|
|
}
|
|
|
|
if (qcrypto_tls_creds_get_path(&creds->parent_obj,
|
|
QCRYPTO_TLS_CREDS_DH_PARAMS,
|
|
false, &dhparams, errp) < 0 ||
|
|
qcrypto_tls_creds_get_path(&creds->parent_obj,
|
|
QCRYPTO_TLS_CREDS_PSKFILE,
|
|
true, &pskfile, errp) < 0) {
|
|
goto cleanup;
|
|
}
|
|
|
|
ret = gnutls_psk_allocate_server_credentials(&creds->data.server);
|
|
if (ret < 0) {
|
|
error_setg(errp, "Cannot allocate credentials: %s",
|
|
gnutls_strerror(ret));
|
|
goto cleanup;
|
|
}
|
|
|
|
if (qcrypto_tls_creds_get_dh_params_file(&creds->parent_obj, dhparams,
|
|
&creds->parent_obj.dh_params,
|
|
errp) < 0) {
|
|
goto cleanup;
|
|
}
|
|
|
|
ret = gnutls_psk_set_server_credentials_file(creds->data.server, pskfile);
|
|
if (ret < 0) {
|
|
error_setg(errp, "Cannot set PSK server credentials: %s",
|
|
gnutls_strerror(ret));
|
|
goto cleanup;
|
|
}
|
|
gnutls_psk_set_server_dh_params(creds->data.server,
|
|
creds->parent_obj.dh_params);
|
|
} else {
|
|
if (qcrypto_tls_creds_get_path(&creds->parent_obj,
|
|
QCRYPTO_TLS_CREDS_PSKFILE,
|
|
true, &pskfile, errp) < 0) {
|
|
goto cleanup;
|
|
}
|
|
|
|
if (creds->username) {
|
|
username = creds->username;
|
|
} else {
|
|
username = "qemu";
|
|
}
|
|
if (lookup_key(pskfile, username, &key, errp) != 0) {
|
|
goto cleanup;
|
|
}
|
|
|
|
ret = gnutls_psk_allocate_client_credentials(&creds->data.client);
|
|
if (ret < 0) {
|
|
error_setg(errp, "Cannot allocate credentials: %s",
|
|
gnutls_strerror(ret));
|
|
goto cleanup;
|
|
}
|
|
|
|
ret = gnutls_psk_set_client_credentials(creds->data.client,
|
|
username, &key, GNUTLS_PSK_KEY_HEX);
|
|
if (ret < 0) {
|
|
error_setg(errp, "Cannot set PSK client credentials: %s",
|
|
gnutls_strerror(ret));
|
|
goto cleanup;
|
|
}
|
|
}
|
|
|
|
rv = 0;
|
|
cleanup:
|
|
g_free(key.data);
|
|
return rv;
|
|
}
|
|
|
|
|
|
static void
|
|
qcrypto_tls_creds_psk_unload(QCryptoTLSCredsPSK *creds)
|
|
{
|
|
if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
|
|
if (creds->data.client) {
|
|
gnutls_psk_free_client_credentials(creds->data.client);
|
|
creds->data.client = NULL;
|
|
}
|
|
} else {
|
|
if (creds->data.server) {
|
|
gnutls_psk_free_server_credentials(creds->data.server);
|
|
creds->data.server = NULL;
|
|
}
|
|
}
|
|
if (creds->parent_obj.dh_params) {
|
|
gnutls_dh_params_deinit(creds->parent_obj.dh_params);
|
|
creds->parent_obj.dh_params = NULL;
|
|
}
|
|
}
|
|
|
|
#else /* ! CONFIG_GNUTLS */
|
|
|
|
|
|
static void
|
|
qcrypto_tls_creds_psk_load(QCryptoTLSCredsPSK *creds G_GNUC_UNUSED,
|
|
Error **errp)
|
|
{
|
|
error_setg(errp, "TLS credentials support requires GNUTLS");
|
|
}
|
|
|
|
|
|
static void
|
|
qcrypto_tls_creds_psk_unload(QCryptoTLSCredsPSK *creds G_GNUC_UNUSED)
|
|
{
|
|
/* nada */
|
|
}
|
|
|
|
|
|
#endif /* ! CONFIG_GNUTLS */
|
|
|
|
|
|
static void
|
|
qcrypto_tls_creds_psk_complete(UserCreatable *uc, Error **errp)
|
|
{
|
|
QCryptoTLSCredsPSK *creds = QCRYPTO_TLS_CREDS_PSK(uc);
|
|
|
|
qcrypto_tls_creds_psk_load(creds, errp);
|
|
}
|
|
|
|
|
|
#ifdef CONFIG_GNUTLS
|
|
|
|
|
|
static bool
|
|
qcrypto_tls_creds_psk_prop_get_loaded(Object *obj,
|
|
Error **errp G_GNUC_UNUSED)
|
|
{
|
|
QCryptoTLSCredsPSK *creds = QCRYPTO_TLS_CREDS_PSK(obj);
|
|
|
|
if (creds->parent_obj.endpoint == QCRYPTO_TLS_CREDS_ENDPOINT_SERVER) {
|
|
return creds->data.server != NULL;
|
|
} else {
|
|
return creds->data.client != NULL;
|
|
}
|
|
}
|
|
|
|
|
|
#else /* ! CONFIG_GNUTLS */
|
|
|
|
|
|
static bool
|
|
qcrypto_tls_creds_psk_prop_get_loaded(Object *obj G_GNUC_UNUSED,
|
|
Error **errp G_GNUC_UNUSED)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
|
|
#endif /* ! CONFIG_GNUTLS */
|
|
|
|
|
|
static void
|
|
qcrypto_tls_creds_psk_finalize(Object *obj)
|
|
{
|
|
QCryptoTLSCredsPSK *creds = QCRYPTO_TLS_CREDS_PSK(obj);
|
|
|
|
qcrypto_tls_creds_psk_unload(creds);
|
|
g_free(creds->username);
|
|
}
|
|
|
|
static void
|
|
qcrypto_tls_creds_psk_prop_set_username(Object *obj,
|
|
const char *value,
|
|
Error **errp G_GNUC_UNUSED)
|
|
{
|
|
QCryptoTLSCredsPSK *creds = QCRYPTO_TLS_CREDS_PSK(obj);
|
|
|
|
creds->username = g_strdup(value);
|
|
}
|
|
|
|
|
|
static char *
|
|
qcrypto_tls_creds_psk_prop_get_username(Object *obj,
|
|
Error **errp G_GNUC_UNUSED)
|
|
{
|
|
QCryptoTLSCredsPSK *creds = QCRYPTO_TLS_CREDS_PSK(obj);
|
|
|
|
return g_strdup(creds->username);
|
|
}
|
|
|
|
static void
|
|
qcrypto_tls_creds_psk_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
UserCreatableClass *ucc = USER_CREATABLE_CLASS(oc);
|
|
|
|
ucc->complete = qcrypto_tls_creds_psk_complete;
|
|
|
|
object_class_property_add_bool(oc, "loaded",
|
|
qcrypto_tls_creds_psk_prop_get_loaded,
|
|
NULL);
|
|
object_class_property_add_str(oc, "username",
|
|
qcrypto_tls_creds_psk_prop_get_username,
|
|
qcrypto_tls_creds_psk_prop_set_username);
|
|
}
|
|
|
|
|
|
static const TypeInfo qcrypto_tls_creds_psk_info = {
|
|
.parent = TYPE_QCRYPTO_TLS_CREDS,
|
|
.name = TYPE_QCRYPTO_TLS_CREDS_PSK,
|
|
.instance_size = sizeof(QCryptoTLSCredsPSK),
|
|
.instance_finalize = qcrypto_tls_creds_psk_finalize,
|
|
.class_size = sizeof(QCryptoTLSCredsPSKClass),
|
|
.class_init = qcrypto_tls_creds_psk_class_init,
|
|
.interfaces = (InterfaceInfo[]) {
|
|
{ TYPE_USER_CREATABLE },
|
|
{ }
|
|
}
|
|
};
|
|
|
|
|
|
static void
|
|
qcrypto_tls_creds_psk_register_types(void)
|
|
{
|
|
type_register_static(&qcrypto_tls_creds_psk_info);
|
|
}
|
|
|
|
|
|
type_init(qcrypto_tls_creds_psk_register_types);
|