From patchwork Mon Aug 19 22:51:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 820296 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c8:0:b0:367:895a:4699 with SMTP id m8csp1653805wrb; Mon, 19 Aug 2024 15:55:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU/CXuIZUKZPbH/G6WV1peMfupiVeIAJtJD4/foupIGWdt2syATxCZPmifGnZRXYi3ESKAf4A==@linaro.org X-Google-Smtp-Source: AGHT+IFZPMLOj0Q6gNpFY4P9vZFOusGtqW+c1ED1wADWH0UAk0hlYmpT608xBSxusPL5qvFGRar8 X-Received: by 2002:a05:6358:102:b0:1a8:b066:e266 with SMTP id e5c5f4694b2df-1b3931bfe1cmr1761237555d.13.1724108136190; Mon, 19 Aug 2024 15:55:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1724108136; cv=none; d=google.com; s=arc-20160816; b=dTQFv8uUI5I9ElecYmr2E87mqo6Lo+PdnLnNtoU7ozSybpPYxnKkNm4FBjXTFuDSIJ k5Hne1fEg7gX6ZM2sJ61VEFY2eBHmAyOLVVobSjYDpHSRkDggvau6fZHiuUiLHVoYLOj QKvGl/p3c7z4Nfg1FAnwyhUTEdq4ENrlIDWw0kxin+pwa4EWNVmxLKCec4NkVVQjBPqQ 1ENAla/RQ5CsQunK7oZPtepJBpofd2sZIR9+nGswzk62+UdcsK3joe7pDchDnZ8wxLsI OiKBJ3QF1ExebZtwUmeCFg+igy1QoR8kWHW2zN0bQb7gEY4umEIwkR8wdjHvdevNxa7F rmWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZEmJWyUe5Z7mps33C1UMKOWEUqjAklVcCYaJjEGW1x0=; fh=lAtovZ3GZsQxN+MQeYKWaWuf7kRcn7ZRKCIP3/UlnEQ=; b=qtXnRJ+bItMB/6EvvaWpx9FRAE6McO7OYk/qLdLFFKZ0H3DdQRC8RMOI6ubQB08AYQ zWElfsjV2nMFUWdrt+Ro3QBPlYD/qnWp5C8JfAQUhhKRKmGYr8+xBJAHOK7b+n89E9Q+ J4bvUcGXmcFBY6dW5uUH6tuuF9bf0Uy+fvipuPL7eEG9iJlA2bHQ+Y2LXjnb9KYBGujZ z6hzi9izbVXx+5TEvWYurWaVa7EmN2qqrgBu9pHwVqI8tYbPxVmMG2tt6xPYM78c4sNb yFAFVYbG8GVusoyfkgQt8gIXUEzfwtQyP/8MU9GYIetN8J4aJEyWvN+rh3hf6wWhHNW4 AbLw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TriDJmWK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7a4ff127951si1110269385a.738.2024.08.19.15.55.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Aug 2024 15:55:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TriDJmWK; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sgBGJ-0000TE-Lh; Mon, 19 Aug 2024 18:54:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sgBF9-0002zh-8l for qemu-devel@nongnu.org; Mon, 19 Aug 2024 18:52:59 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sgBF7-0000qa-DC for qemu-devel@nongnu.org; Mon, 19 Aug 2024 18:52:54 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-42819654737so37538355e9.1 for ; Mon, 19 Aug 2024 15:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724107971; x=1724712771; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZEmJWyUe5Z7mps33C1UMKOWEUqjAklVcCYaJjEGW1x0=; b=TriDJmWKIhuEaOCa2LRFASnKLIjdbBSHhcmakHsJnEkugPiMvpub2OZsCeIpCV9DRE 5ydszRT+DDeA2UVOB6gaDstDwQ90MXxp2Cti8uszVNgioW/HrwBbTOksWfUY1hflbRt4 3Vb1XuAqfPrO21mikfp3S9FhKIfQxVJIPtO404hzgEilPH6hpNi3BvOWYq1flZVk72KK 2khCRjZ9dcfxWZuhFNX/rwLMDpOv+8z3rkEbCgTUWN0t6Zq59Rgo5ygzgjzwYIJlOrhE GiM+qrdua8UYSC+LBoneIV4txLNV9Y1l7UvGaWanEH0BVxPoT7jI7DD5tGbkSfiDe4Jj 1+rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724107971; x=1724712771; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZEmJWyUe5Z7mps33C1UMKOWEUqjAklVcCYaJjEGW1x0=; b=o6shGNJYc1tcdkQjCGiggZI4MKYMyswxmf4HaIsRazVH1plTFo+3s7BZvJU0Q7dhG2 Zo3xXeyHGcXbWvpmB1iYfxSZiQvqmIqKEyKaOOXWJtzYiG0fcZxeC2FEt1rlNcHt2heV InJ+8AX0YxCuDTzG+AxOX5IMVhscBpRXm0PUzOH7Lx4Auyb+C1yfplooCQLITmobc8Ib xqaQXARuz1jIrr26PVUOUYz2uestyBID6fMqQ0OUuaMZnQD5ORR9sTMC1ZoqLstQnzHR kzj2ZkGedmcJkpEHPy+tv8yh/0UQqgA46UsSbsD7gUQQ6Ha6UTSNi7uMyJcL6/0KyL9I 0/zQ== X-Gm-Message-State: AOJu0YzdF1Stbb/hf/Lv8V1r7x9mfyTMfN5GXaf2hpGNXJ21f89v4fwf rY2EJMjr2vLA07rI42uTjktmb3yJeTwYEy+6p3yMH+q4eArEYUFW32RMr3epr93dRZqTtBBy1rt O2K0= X-Received: by 2002:adf:b652:0:b0:367:9088:fecd with SMTP id ffacd0b85a97d-3719431e602mr7867047f8f.7.1724107971108; Mon, 19 Aug 2024 15:52:51 -0700 (PDT) Received: from localhost.localdomain (88-178-97-237.subs.proxad.net. [88.178.97.237]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429ded18630sm175647555e9.1.2024.08.19.15.52.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 19 Aug 2024 15:52:50 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , qemu-stable@nongnu.org, =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= Subject: [PULL 20/20] crypto/tlscredspsk: Free username on finalize Date: Tue, 20 Aug 2024 00:51:16 +0200 Message-ID: <20240819225116.17928-21-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240819225116.17928-1-philmd@linaro.org> References: <20240819225116.17928-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Peter Maydell 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 Reviewed-by: Daniel P. Berrangé Message-ID: <20240819145021.38524-1-peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé --- crypto/tlscredspsk.c | 1 + 1 file changed, 1 insertion(+) diff --git a/crypto/tlscredspsk.c b/crypto/tlscredspsk.c index 546cad1c5a..0d6b71a37c 100644 --- a/crypto/tlscredspsk.c +++ b/crypto/tlscredspsk.c @@ -243,6 +243,7 @@ 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