From patchwork Tue Aug 3 13:24:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 1512929 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=amd.com header.i=@amd.com header.a=rsa-sha256 header.s=selector1 header.b=JN5w1n83; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4GfG4y5sMYz9sRK for ; Tue, 3 Aug 2021 23:32:18 +1000 (AEST) Received: from localhost ([::1]:40372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mAuWl-0001oc-66 for incoming@patchwork.ozlabs.org; Tue, 03 Aug 2021 09:32:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQw-0000LZ-Fg for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:14 -0400 Received: from mail-dm6nam10hn2220.outbound.protection.outlook.com ([52.100.156.220]:55392 helo=NAM10-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mAuQu-0001f2-LA for qemu-devel@nongnu.org; Tue, 03 Aug 2021 09:26:14 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O0IOH3AYGlboe/O4DI/MJ1s5yXQSc7LB2r/jpfEIaSGLIcmCjPMRyOb0jrdMC7ywXpwKhj3+/Mq95apx6dQBbLHTB7IMtb6lPs0mOdsTHcjQzWHIuxp4hmLvlmwf4IBgqDpZwEesqG2oGrOE2nXcQ8fHKJaMEgHOsfGXg7Odoia9nTsklMTunhzfW0WWYQi6MAcW69ODnxNTkuEO6gEetWt2AofXyB+KHHgrgLIS+8NXP3u6j8ZEnKyFwcAP6LD4k8gTNkcfY9Pkx0L/RTaVipPINh43abzBiP+YW/IAZxHXgls5VzaRznO11jgo0lZqd+832z/Ce8an/GDxVxZ/uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dEyRwSXM7cVIRuYNGwYcnj8C+/Wd1wRZz3seQ4KNW5Y=; b=CKiwYYl9ESj9+ADWF/EcpO2wBuIyO4up4KcO0OfvktvWN4c24OzkxlgYyvV/G5mX+xVme3a6AUlg29cl/m2NQZ4tJLbJ76DV/aWqK1mhn+3wFooOtNXirwOosPuEuNKvBX7il8q5R15LpMH6kxBBq1hECUEXzk03zaNl87eA9PKo7H4vRSs/2pXIh/E8hLFewKoCn6XNWz5GXoLuXMTKocEJdv4mLiZG5pvFVHBN9bH9uVBs/pusHcIBxDalukZVaK/WF2CRJUjx3lqMRumw8MpttHLE4IxOxT/Bz7WAa03IfSKZko8v1xz0ZEdY2O/BdV/f311JM3WIVGUHuKtBTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dEyRwSXM7cVIRuYNGwYcnj8C+/Wd1wRZz3seQ4KNW5Y=; b=JN5w1n83VP9F7S+9xgFcK4VoQkxQhdGg3y5RlCLOpaIsTo4agfSFbntNmVMmptqXrhr4tSJxXkQoqkLWu2mK7PGUIwgqxHLcQeIEfimo8/POE+0Yfdn8Bp1C0c3HVFGod07TQeCNs4DALrYMiHGNrWBhYXxJ0T8KJ1WRNmYK+iE= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB3909.namprd12.prod.outlook.com (2603:10b6:610:21::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15; Tue, 3 Aug 2021 13:26:08 +0000 Received: from CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0]) by CH2PR12MB4133.namprd12.prod.outlook.com ([fe80::d19e:b657:5259:24d0%7]) with mapi id 15.20.4373.026; Tue, 3 Aug 2021 13:26:08 +0000 From: Michael Roth To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Basil Salman , Basil Salman Subject: [PULL for-6.1 3/6] qga-win: Fix handle leak in ga_get_win_product_name() Date: Tue, 3 Aug 2021 08:24:49 -0500 Message-Id: <20210803132450.1093602-4-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210803132450.1093602-1-michael.roth@amd.com> References: <20210803132450.1093602-1-michael.roth@amd.com> X-ClientProxiedBy: SN7P220CA0003.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::8) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost (165.204.77.11) by SN7P220CA0003.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.15 via Frontend Transport; Tue, 3 Aug 2021 13:26:07 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4967e4ee-2964-47ba-4f4a-08d956824097 X-MS-TrafficTypeDiagnostic: CH2PR12MB3909: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7DCCK16MVSGAREbJ94x1a0apKSWrxzOAz/tT3I7cF6jhltyKx0+39qg4887JSoj29GWbMRs+OSCdiQompTrpyXZrqK0czpKmLsXGuDcTiRhkxKWHmCOteiwizdcqADPQmvwd0dfWbZBYgrS1yuz0OZq/RJ5IEa8m1W/HLxdzHrzB2XNuKLzp0JfMErTN+j8kMfJ084vw0alELgUp5HYVV306b9/v0OHNfe0uwAf+5qovYkdpH3+8tThfFu2DjqaHT1nimsZEQNvdJTejiJNGX+VDYHaiJ89JTcH8RI3xDi4nj40UQjpIf6crcvLe2zfFnf6Sd0NHnVDvifMgoCk/Z6MdL8CXZhLe8MbYDa2+iZBbB6bCnUUqVXl5WfBLpDGUqhdBwsPLxruUMSxTL4UPQqkSQLqExZcyhK/AIoxdoaRPJRpCW7Zvd/ic7jOt8/nAZ6dkRn0QCt4+RURuK9MXpqcChywe5OL7ZMFCj1psW31rCeKcEFo4c3cSMk4GmK9W2oe6IKe3rH1i7FUUGPQTl6/D9lpL3GCRI9umX8lfPsM1a4HyPRYMMD935tdSXtdZl1n5FoiOpI4sjDjwsjJoDv0ukN9rvUR+6HraUQcSIP5pEPvSj1ZYacS2rwFLTWRepK7G4p9crIJWuROCY6o8LY41V8IT98boCq089TDRLgY2ut+YscaUVegMYMW0Yik1SmIfP0Wv17kRdMdOhVklabyiwMF/0DJ523zoWFGIMjVxQcqQD0PaP7e6OVZCQBTSvqsY8mxEKtghoykg4I9oX+tSZ/ufv3ED3X9byshPa1oLWUv2JfMHTic1IxJBcue0vuCtzF4I40+r5M6zT58G8wJ70igHYvMW/Svj96ktreJtFmTbYBCidRzPstNOIUNmw34SckR3ILoT/uXO1erAkkrq22lGqV3oiqsY8ywJe3bE3SCrLOVGMP8Zdgmig7x0J4x6Tu90ebRvJMddt9lUAvkxKKgyY/10qmEuP1IfVZfoUcU1FWuNDanhTOh7gG3xhHKCqn3wKB69ikxhc5uRgLg/huAyvA2azoYyBSviFSegJyy9P7DnDFtOevCsK1GGuZ77N78jfuXts/FrmZwswvueL8jmnGqgtoygjPkI+iu8lhP5BzNIvZeF3O5zTvDd X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:5; SRV:; IPV:NLI; SFV:SPM; H:CH2PR12MB4133.namprd12.prod.outlook.com; PTR:; CAT:OSPM; SFS:(4636009)(396003)(366004)(346002)(39860400002)(376002)(136003)(6916009)(86362001)(36756003)(5660300002)(6666004)(966005)(8936002)(54906003)(316002)(478600001)(4326008)(6496006)(52116002)(2906002)(1076003)(8676002)(83380400001)(26005)(66476007)(66556008)(2616005)(956004)(38350700002)(6486002)(38100700002)(186003)(44832011)(66946007)(23200700001); DIR:OUT; SFP:1501; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rcFy/RQmfTHr+yrB4rKkZk/zj8EA5pSIvujsoiM+XqHRN0ZV0DRD27e5pew1LxxzYntCK8LoJCFhvD8/Aa6hpFGbH8Sp0UipPgvwi3/fYshqUWuUgrIr4yxs/Zo0/eVGg/a9ma2nizxUFXK8JF1yL0UELldLwV4ZteJ00WryRYwdW1QxXWGd1TAUk5FuaM2lt9YOrjX+KflQF/Untgc2hCvmznSaDuo5vTha9Ka54VG/SHbQSKEg5cVxFghh1B+5RoXkVIkhBlhzrxIX0/mBmUn3rQD9MYGSmNkmRKekIH9Gd4P9iFeweup7IR9zuTCGl7Lj900qLniPcUfQTA0vq5Oumb0hqeT68P/WnjGGfB0pl47X7A3bH9jqQV9r1ZZFDlOFQLCfoY2b9Ynfu623zBMIwq9JyUSoKLV4J1/Aw5oZIJNN8fmmS9TmBKlbKFMxzwGs5zUuE+QOWSQy4+ftPKYGTaXbbkUPhe4ga3BPRONOQr70IdXaaIXwz0l10W6uvcJCyj5FdAvTi6YnrXT+rjX8tOezxjO6/s8Beb3eADqtMzmJacr+QRTZ8fULNoFbd3nXwRiHBBfuFFoGRmFFGTcsYo7mZNtrNAWO4bO5sPb2HGY7FVO684H0W1EII7re5oecB4P+tzIds/6nyBOstm2le6WqquG22THvLaDd+aH+LnkphwKPOluRr1Sx32jY6AslLzn5vQ3heX/MWxVsW8YQvtvgpXEVzOSTR7Pbz01z3kJkrN+U0bhWCJoNVpigsOvk36ZF+im6ou09YZKHIQkMjc65k50oFnnLXg9KD4mLLut42merq613T3M+1jWSZgT/3q6s4aHNco24UNnPLhGDb8PaPHs77M1F43wpvVyyRz27QIBA2XADmKTiqIydMrQ41rA2o+u/QJJhnLQu9S7gw9R0kQz0UJHfqQzwF6I7LM9JC9xXZTu2DmvcZlZskJbb7XH6k9VSptpyhyxIYmlqvyKyDcDA50qAMYLFblZjZ1jh0xLBrYaoRnPj1c/nHeGL636qefF97iQE9OwLjFyupNQ3roh2x6+X3HIYAEHTSXEg0SFgHqCDDMstkvORmZEQ8pCbpHBFxrP6gCMS2VnBn4D2aQiobuSZhebF2ckWPPKWMDKqSOTNBu+a3CsM2gFb4LUlo763ddcdlVdg+yDOvSDBlPKogjd0//Y9Fcn8UTEo6evQgFi0yd45zFYUBj/GdQc104ODuCnBeSoA4gC3XDcEJoGICOOOHIM3r3kETvCk8IxxxeJ+nF6d0Mg4GpMrw91qfiSlCLI572NM0dT9ph7n6d/Borw/CdJcAhS3ezIk7tEPpnjchRtWrMFQ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4967e4ee-2964-47ba-4f4a-08d956824097 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Aug 2021 13:26:08.0196 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dRD/udwoNDK/8XPZhlMCShT1WqwaeVDhqM6fTd66O/wxmrh+BUy+lQveIO97b6Aa/wDmXO7cZBz5x4dduVOstg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3909 Received-SPF: softfail client-ip=52.100.156.220; envelope-from=Michael.Roth@amd.com; helo=NAM10-DM6-obe.outbound.protection.outlook.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, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Basil Salman 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 Signed-off-by: Michael Roth --- qga/commands-win32.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 763186efd4..098211e724 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -2231,7 +2231,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; @@ -2241,7 +2241,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, @@ -2262,9 +2263,13 @@ 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; }