From nobody Sun May 19 11:31:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass(p=quarantine dis=none) header.from=amd.com ARC-Seal: i=2; a=rsa-sha256; t=1628560171; cv=pass; d=zohomail.com; s=zohoarc; b=iiWAMTbD36mn6vMOzJwO2krMPGVbK3BX/pswZzEds2vGO5QEyVle4iVzPtmmB6JevlRY8gmn6qt3ObztSRf1MBpwdxIRgHsi1QCViQKFwlR646eqbmS8OIC/UrYIwndO1ZNGd9WjZMcmQvm7bY7lWzMlIPcGKoq1LiWqY98Nbmg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628560171; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=zkh9/cX+1VMUXFpdzU9C7SvKUuISGOK/hqOkA/zARJA=; b=YXYltF6JnmwEg960xNmDqsk1ja93dzGt9FSDs9aihbr9FzesQch9kcy56LGeJfdYi+g1qkyLEUy6GLIZ8Mhu0nWwlBEZWoqHIS3gFOhJSy5u/p7Zvt7icg1psYxHsOT1c9NrGd75eCWp5ydfOksU/Vc5atOt2ZY1p/2hbh+Q6K8= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=amd.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628560171249802.5004690174034; Mon, 9 Aug 2021 18:49:31 -0700 (PDT) Received: from localhost ([::1]:35270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mDGtW-00034S-9d for importer@patchew.org; Mon, 09 Aug 2021 21:49:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mDGsl-0001dY-Ok for qemu-devel@nongnu.org; Mon, 09 Aug 2021 21:48:43 -0400 Received: from mail-bn8nam08on20611.outbound.protection.outlook.com ([2a01:111:f400:7e8d::611]:27873 helo=NAM04-BN8-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 1mDGsj-0008Ql-J1 for qemu-devel@nongnu.org; Mon, 09 Aug 2021 21:48:43 -0400 Received: from CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) by CH2PR12MB4119.namprd12.prod.outlook.com (2603:10b6:610:aa::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.16; Tue, 10 Aug 2021 01:43:36 +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.4394.022; Tue, 10 Aug 2021 01:43:36 +0000 Received: from localhost (165.204.77.11) by SA9PR11CA0015.namprd11.prod.outlook.com (2603:10b6:806:6e::20) 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, 10 Aug 2021 01:43:36 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nurNTx2Sosth13VtSYKUn01s9U3rSyC0LbqxpQplrZ9pKI5/P5gzn9BKn1/m/asyLAlOuer4TI2FC2v+gREa4Ony7WIWCta8qi9bAvIbCWktp9cPCCA/q+HR2bjq+dUUpfr/GqHE/iFwhNyQsyiklzzq9azrZ5qoofuP1hYGicV5PWm9tIoWGynWpZhNY830YnSYxUFSN946Dqqn/yPZT8TR3E6qR0/yMuZ8SfXYYvrn/mM1M/6uoLIniJrAS48scDiGXigDop2gCO6ztvfQ9gzltriGUDOwtmXkdIjfvLUFsqjI8YJZr7ts92gVyFz0sWsy0I6r0CW1r7lbHzdQGg== 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=zkh9/cX+1VMUXFpdzU9C7SvKUuISGOK/hqOkA/zARJA=; b=ZKKVB26sYzh+TAZspxsYE9cdZO+AAerhDvIBfENBLujUoQAwZWgfqqgsKjESgVKEWUYavrw//Ntp+/6InuIuaIFaz5jM59m5qJ97B0XVCSVJFfHQqM0kH7sOxO7HWNU4AiOYO9xI6ibE01CkDr4qbHo2peTVdxJwakaWOH4Qk/sthKFk3jOqFchwP1Sx9WsGykbc+TH/R4aC1ey/6wCKaAcchXBEmDr6RSY6Y+7owNkIAyPWATbFEgAXtZ+DJwc47Mun8YETT+FcUdU33A3AkCBAKSxCgYnw0+R7bcuEbDJiP07j1Kq+FhOuIZaqjOQEg4E9uDgoKH/CJCCiWtPHLg== 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=zkh9/cX+1VMUXFpdzU9C7SvKUuISGOK/hqOkA/zARJA=; b=ZarnR0jlL0zAEqE4kP/o4IYWkMPuqF1m6EOTnAk+iWii0uCLwWCsCHXiMmg7WBvF3JNYBc+zWTw8YOCyX3MxEDFIhVfKFuJF3iQ7Ht5soOsTBZGJg9WuMAipMI42khmtGU0I0e0b8xzRo8oHuX+tzM714Gmy5mLNRcp5BwxpoU0= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=amd.com; From: Michael Roth To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL for-6.1 1/1] qga: fix leak of base64 decoded data on command error Date: Mon, 9 Aug 2021 20:39:24 -0500 Message-Id: <20210810013922.215443-2-michael.roth@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210810013922.215443-1-michael.roth@amd.com> References: <20210810013922.215443-1-michael.roth@amd.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SA9PR11CA0015.namprd11.prod.outlook.com (2603:10b6:806:6e::20) To CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 593d440f-25ad-4ca4-7b60-08d95ba0454a X-MS-TrafficTypeDiagnostic: CH2PR12MB4119: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +DXhRSFx2/+qbQY4Q8QrPKRca+M+h27hPqS3GbzS1rQJGXrwiAJwiNrVchEOBeLSu1ple9zsPV+zGMR4lIfyl9QqYNq0BKpgM5wOPvqgcH62dgx2201Q+6Lon8PISYCqyjKnJ/Nm3UIwffeAXKu/5Bl2R4PpKXwn3a8qETTPsaDF3WHuAG8wcnGgHdlt6WfHnUjtzwdWCU/Globpqz0bvsvHEEgNgwaVjF19aWyIN2J3g2wFLvuNw6RNmzjrjLZHRqsuow7TE8yvB48fCUFx0A/EJmdajWvCOjQhJXucEaMGA5GxPdac5per/wnDCocn646yPBoczDUUGGfS6dR/GDJYYsPUDZA2opPo2rCf1kVh4PB5uJXMGlo5YSo8EUP3AXdUJIYlGB+9F6BE7N5kqFy3QoCKGDrYntHnEv4/CIHJs4+TxlYLIxS10xD0vqBD6xOFr9RrCIDzimdudXD1Htxkqsb55pSfzKmFGUotjjgxDAIPj6Bi1VMcmSW6mn9jzC3WcWNnHvgIhNeZxwPOLAQIRBzURGCVMgPz0HFeO36ItugISALRBwSqe4A/2bjTTfHNZYFrZnY/wtW40iCpw8VfhiqBQxRy84OPOEebjK6MmstB1X83rVxZb/UEHVYezUn7Ij3GGwi3MJj+GYi6zezdnypwDb34+wZbDCK7ORjp29jmOJbAYIju4HfWKnFj X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH2PR12MB4133.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(346002)(136003)(39860400002)(376002)(366004)(478600001)(6916009)(66946007)(52116002)(54906003)(2906002)(66556008)(2616005)(38100700002)(66476007)(4326008)(956004)(38350700002)(6496006)(44832011)(8676002)(36756003)(5660300002)(1076003)(6486002)(26005)(6666004)(86362001)(8936002)(83380400001)(316002)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S3dWY2VnQUcyUCtnMzZJbzExRk5SalF3Z25IdERtSVp1clBrMDJSZDVjVjY2?= =?utf-8?B?Tnp6R1dNZUtYSTBLK2Q2YWVHY01KWVc2T1VKTElHbmoyQ3dIc1ZoRVZWcE5h?= =?utf-8?B?VWN4VUp6MTRzeTVRY0NyVGVBN0ZFQjJqOWFodFJxaEl1QnhKa2p0N0prM0pi?= =?utf-8?B?aVI0R0c4ZFJXVWFlTHZoaXhuSVdGcVFDUnNXcU0rc1FaMTdNV2VoUFQ2SklR?= =?utf-8?B?ZWRUWm1rU2F5QWtEUTNKU05Qdk55NjhyQ3pVcXhEcjA3N1d1RnRVb08zb0ow?= =?utf-8?B?UFZHcVFwWWJHQ0ZTd2w2MDhKZkxTc1J1L1V1dFVndUY4dFdXQ2t3NE1GSEdD?= =?utf-8?B?RHdpRGU2QWNBNWFLRUhSTXN4ZU1lcktlQTBQUHRDK213R0llN3Jld0pnaFZr?= =?utf-8?B?bWNHVi9YcFAvZXhzNHVVVDhORkNGanY1L0VuS25CdzltWU40K0FVZ2FCdE14?= =?utf-8?B?UXNTd0ZzVzVybktxckZUSGVDZUlaTmcxeUVkT1VKVDJ5Q2UzdUZ2V1FEY2cv?= =?utf-8?B?Vnl3MEFQekR2bHJQd05oMkYyZjRHT05NdUZMR25sdXdvbmlBRXZoTmV3bi9w?= =?utf-8?B?KzJsUkpURWZRc0dscHUvL01WcjRaWGlET0RFRmFHd2dZc1QzZ3o3dzQ5bkNt?= =?utf-8?B?cVpZdk1QWnU5OGVjYlExam1vb0VRekljWTIzZGZDM2pTamVROEF3a2lOcEhJ?= =?utf-8?B?alpGTXEveWNzVVh1Q1IzYlJBeS9RYXVWTTBwYVVYcXdacmVoRUNSMjdSNExD?= =?utf-8?B?Q1MwNVNGNmVISzIxUE9XRmxDL2piSGxna05pNWsydXozRnEzTXo3NHl0RVBl?= =?utf-8?B?cTJMN1E5eVRRL2F1a2k5eVhWSlZYVWxZdHJsMDM1OUtBbERlTUk0S2pLcFVa?= =?utf-8?B?YXVOZkFJbFdKTjJ1ZEpoNnZZT3lXOElHWmh1empRczVhOGlsMTRQQk5zMndR?= =?utf-8?B?ZWRBcytudkZHb1AxWjdYRkhjdzNyMHhvb0hYakk5SVFMRnRIMzl1RDlDc21a?= =?utf-8?B?LzUzNjNueTJNZTZYU3Fwc2ZLdUNvY2ZvTGZJa2dKRzFCd1ZnaFB4bGNNbkV2?= =?utf-8?B?UXlDUW9RUzFLamk0d2FFQTlkQnoyd2ZFTXdMVCtDcU9INDNJTS9KVHB6U1dG?= =?utf-8?B?SVI0dUM3VHZPNTh3MnJGMjFYOGU0VGVGeTBKMm96aytGbUVFN1JRUkdmNnlZ?= =?utf-8?B?RW9EcTlsVFlQLzNKK1NLU1lFTGtzREt6akllbHh2b2pDQnRwbXVNWEw4WTcv?= =?utf-8?B?T1N1Zmt3VlhVZHdkTlAzNEYxeTc1aktBZVJETnFTK1QvVm85NXJveUdsSXlB?= =?utf-8?B?KzZYOXVUeWtTYXdlbWxiTHloQUhkY3lOUWM2c0xPQ3A4Y08vc3NKbGZQV0Fa?= =?utf-8?B?RU1wZUkvcVVETjBqV2Y0WnQ5NzkvUUNBN0dmMjlVTUMxMitpeHhEaFhKZkpr?= =?utf-8?B?TUN5WUhSbFBPY1pSU0NrYnE5eDZ5V0JPNkkra1BMYmhBNHJmend4bHN5NlFs?= =?utf-8?B?VTZZK2FxMzFhNU9lTzQ2V0hBLzFKR2VPSGEwUWZydmpHVkRGNDF2US84N0F5?= =?utf-8?B?ajBxb0Z6aDBEdzhaNkFWZDNFL3E4djBPQW1qVnhnRXgydFlFNno1WGVqY3RW?= =?utf-8?B?NzJIUHFWZkJ2NGYwU0xtUUU2VE4xdVRNblhsUC8zSzlGVEQ2VDB4VlMyM1cw?= =?utf-8?B?VkIvM0piT0dlQVZHOXd3VGNLQVNzeEtYczBPQ1FCVnplM2IvNWU3MFhCdkNj?= =?utf-8?Q?BZ3CY13RRC2coaZ8EbmVGXG9ubpYqlgCebPwgt8?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 593d440f-25ad-4ca4-7b60-08d95ba0454a X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB4133.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2021 01:43:36.6623 (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: c8J/o0cEahf76E7dxPIz/u1nSIu+g3BbqqJP+5Y9RbW588mge8wMHv4S13v/c/zdFF3s8iNX4c/yi7F/q8hiZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4119 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=2a01:111:f400:7e8d::611; envelope-from=Michael.Roth@amd.com; helo=NAM04-BN8-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, 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @amd.com) X-ZM-MESSAGEID: 1628560172188100001 From: Daniel P. Berrang=C3=A9 If the guest command fails to be spawned, then we would leak the decoded base64 input used for the command's stdin feed. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Michael Roth --- qga/commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qga/commands.c b/qga/commands.c index a6491d2cf8..80501e4a73 100644 --- a/qga/commands.c +++ b/qga/commands.c @@ -402,7 +402,7 @@ GuestExec *qmp_guest_exec(const char *path, GIOChannel *in_ch, *out_ch, *err_ch; GSpawnFlags flags; bool has_output =3D (has_capture_output && capture_output); - uint8_t *input =3D NULL; + g_autofree uint8_t *input =3D NULL; size_t ninput =3D 0; =20 arglist.value =3D (char *)path; @@ -441,7 +441,7 @@ GuestExec *qmp_guest_exec(const char *path, g_child_watch_add(pid, guest_exec_child_watch, gei); =20 if (has_input_data) { - gei->in.data =3D input; + gei->in.data =3D g_steal_pointer(&input); gei->in.size =3D ninput; #ifdef G_OS_WIN32 in_ch =3D g_io_channel_win32_new_fd(in_fd); --=20 2.25.1