From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96E1AC433ED for ; Mon, 5 Apr 2021 13:16:33 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 149A0611BE for ; Mon, 5 Apr 2021 13:16:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 149A0611BE Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=daynix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTP5j-0008Ch-Tu for qemu-devel@archiver.kernel.org; Mon, 05 Apr 2021 09:16:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTP3t-0006np-F0 for qemu-devel@nongnu.org; Mon, 05 Apr 2021 09:14:37 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:50881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTP3p-0005yZ-UR for qemu-devel@nongnu.org; Mon, 05 Apr 2021 09:14:37 -0400 Received: by mail-wm1-x32b.google.com with SMTP id a76so2496140wme.0 for ; Mon, 05 Apr 2021 06:14:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mbyQp3khJuO+uC4dNzZJaaNxfsygnlYnxyi5g7TNEwQ=; b=BSmiNRSPJ/62EcOpPZWCFRakuczpp7+Axdst0iTO/Eq96OIiEoqNGcgWpVdRaEfKZa kgXl4PEe4/HBGcxuzFcs0uHJaDUuMSlHMWlWb1GS4dSMjUKQWyHs+UxDqU/c99RPDcdf o6gwKvBzqSrtLJV06F27iwKCfS1gmZ6rKiLQAFC1QRndjO/4lURisRccSn9hZMcysdhm k0fY54jxSkrR+dpB8Tq8+Pk+SvmxiCsbKtoSQc0imnw5OvjShYZ1nSG2hl9mYFE7iW8T KqO23EShONbKSvEDiC9pwmIdiTsJUMF1gZKvtwORr2uYES+XwUOqwLWofxyBRGOmpWi0 UcBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mbyQp3khJuO+uC4dNzZJaaNxfsygnlYnxyi5g7TNEwQ=; b=YwtpoiGek4ux5mhx+F4Azq78Nfviu54UA+f+7wJHQW1369BtjP01TrR12HKtKeabjb XfWYQFnSu8NjNQe16AUcB6IZtu6f7T8QLMX78Fyz6VY6+4DqotyXNwClvywXbolMcQ8U c35EERJEzeUU/abIZXXiZs8FEbYMEE2PN44cUMUTBUkiNtepZxFaO3WT5JJWsGrESOSC /cfrVzQTIsuYTzUht+e2SVYrN9pRC4e9vIBxv7mxCBtYppnGFyiOhq42MLBsEll2UB+t 0oKoVe52MyIQw/Oj8oWJPweaUH30ysPHN08klP92rrW1YSOVU0ldqtoZG4WdTXKQG+xI v60g== X-Gm-Message-State: AOAM533QXWJL5eMF8FKpM+jXCLx0ETeiR64J7qy13ZIKc/Q6xNJoNpGq hh2jwktF92mwzXN2+8Hu35k/BBa5Ou4qhw== X-Google-Smtp-Source: ABdhPJwjvFld8u+crzfurmXDGaeg/2Fr1Er37XN/CDBdB82jIFoBJZr239AtATv6JXKuYLxN8E8uTA== X-Received: by 2002:a1c:f705:: with SMTP id v5mr6646196wmh.105.1617628472442; Mon, 05 Apr 2021 06:14:32 -0700 (PDT) Received: from localhost.localdomain (bzq-84-110-34-91.static-ip.bezeqint.net. [84.110.34.91]) by smtp.gmail.com with ESMTPSA id e9sm12661542wrv.92.2021.04.05.06.14.31 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Apr 2021 06:14:32 -0700 (PDT) From: Basil Salman To: qemu-devel@nongnu.org, Michael Roth Subject: [PATCH 3/3] qga-win: Fix handle leak in ga_get_win_product_name() Date: Mon, 5 Apr 2021 16:14:20 +0300 Message-Id: <20210405131420.598273-3-basil@daynix.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20210405131420.598273-1-basil@daynix.com> References: <20210405131420.598273-1-basil@daynix.com> Received-SPF: none client-ip=2a00:1450:4864:20::32b; envelope-from=basil@daynix.com; helo=mail-wm1-x32b.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yan Vugenfirer , Kostiantyn Kostiuk Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" In ga_get_win_product_name() a handle to Registry key was open but not closed. In this patch the handle is closed as part of the free routine. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1929144 Signed-off-by: Basil Salman Signed-off-by: Basil Salman --- qga/commands-win32.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index d51833ef15..8cea3ec0f8 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2229,7 +2229,7 @@ static char *ga_get_win_name(OSVERSIONINFOEXW const *os_version, bool id) static char *ga_get_win_product_name(Error **errp) { - HKEY key = NULL; + HKEY key = INVALID_HANDLE_VALUE; DWORD size = 128; char *result = g_malloc0(size); LONG err = ERROR_SUCCESS; @@ -2239,7 +2239,8 @@ static char *ga_get_win_product_name(Error **errp) &key); if (err != ERROR_SUCCESS) { error_setg_win32(errp, err, "failed to open registry key"); - goto fail; + g_free(result); + return NULL; } err = RegQueryValueExA(key, "ProductName", NULL, NULL, @@ -2260,9 +2261,12 @@ static char *ga_get_win_product_name(Error **errp) goto fail; } + RegCloseKey(key); return result; fail: + if (key != INVALID_HANDLE_VALUE) { + RegCloseKey(key); + } g_free(result); return NULL; } -- 2.17.2