From patchwork Fri Dec 15 01:35:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 36305 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3442DC4332F for ; Fri, 15 Dec 2023 01:35:44 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.49774.1702604140983556203 for ; Thu, 14 Dec 2023 17:35:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=AUmoXC4z; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=07138f1871=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 3BF10GqX026239 for ; Fri, 15 Dec 2023 01:35:40 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from:to:subject:date:message-id:content-transfer-encoding :content-type:mime-version; s=PPS06212021; bh=/pbOfAPrZKk+6TxuTg InhJedp8RED5vu6Lm8qBjWUZs=; b=AUmoXC4zB58dQ15VTXBgwDfCrUg/yUjGVI hC2MN0+L1krhekIsUQmy87m7EA7EjPWVCpwa1ajIlxLJihe1hJJsitylWn7fqKi3 FzREKBA66vB4aH47GRTo3aqtSRwBAjajmcazP9FZw94ReTqzClf5oYLH13ah1rwK DXtMO+PXs5Dilkj+pkwJcmaeZ2ZL/s8EtgU3css6EhzR3vkHJXOV1PRKoLWzXakO fBjAADJe6Uizw9zNGa/8iSjXAVJghty1EKp8I5ys/gUuXqwwDYHWVNu8d5TJ6SRl NGrHFp1b2BnvaS14HRb2Xw1YauARICoXYzStF1GZLdRWcbbNEF6w== Received: from nam10-mw2-obe.outbound.protection.outlook.com (mail-mw2nam10lp2101.outbound.protection.outlook.com [104.47.55.101]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3uyrcqs53k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Dec 2023 01:35:39 +0000 (GMT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=izQJ4smfvukWGELFWPYQYh0BCbu5sdo4hwW37JmJT40g6B1GZlONq3gPZLJTNoCNJkLQaLp5getwpB0uln9yoYVQzYmIEjcJKGWGsgPOBJNJkVetMMW5nPvIM0IDOubdFz01u/HfVEsUXIWi8dJmF/0EwJQXEKWUSyZBWhd3DrNXR2MoFRl2cBStVOoAqCRYufSMHuO3H1xNEUOfbibjb6+x0p5AFxJasnv9RfcFsZoHHHW5yX21Bll+A+WJHV3VL4kCB4ZDCvC5+jkE4DrkE8Lv9BzNDpRz96ie7skenJR7My3OqC7bUcrFM9Fsy2asO83LkhlGkcNZzFuKN2TBYA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/pbOfAPrZKk+6TxuTgInhJedp8RED5vu6Lm8qBjWUZs=; b=MpKwutSIuZKumFi26JHcXh7GA80uZst2Od5E7k74GZohkMLwaxU2r/fAruftkKf0HIXIrzRBJB3YUqvdyjSRYX1CpfuZdikbfeI5vX6HICgQrfe3g6u1HkVB7gZKIBVug67xxkmVXx9ePWja87hd9TtMOI3U2C5NJJNYplKJKweKy25oka5tDtwuMqH1cJgJ3A4RKk3UAcEsCd8zQHPVUCBlu5BSi04g6LCLOtnuhffYeaUWcNiEAE+QkWQ88wRw14Kf7IqUzuZf0ZIAy1LH3gJAqR6TEwF1e/BHPHXSZ7r8HLsRBKfY5fwFLNl2u4y98BFlUk6RxBW610CG69tTnw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from DS0PR11MB7484.namprd11.prod.outlook.com (2603:10b6:8:14c::10) by DS0PR11MB6397.namprd11.prod.outlook.com (2603:10b6:8:ca::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.28; Fri, 15 Dec 2023 01:35:36 +0000 Received: from DS0PR11MB7484.namprd11.prod.outlook.com ([fe80::c56:aece:e7ef:6cb3]) by DS0PR11MB7484.namprd11.prod.outlook.com ([fe80::c56:aece:e7ef:6cb3%3]) with mapi id 15.20.7091.028; Fri, 15 Dec 2023 01:35:36 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH] open-vm-toos: upgrade 12.1.5 -> 12.3.5 Date: Fri, 15 Dec 2023 09:35:24 +0800 Message-Id: <20231215013524.2167317-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: SI2PR02CA0049.apcprd02.prod.outlook.com (2603:1096:4:196::7) To DS0PR11MB7484.namprd11.prod.outlook.com (2603:10b6:8:14c::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR11MB7484:EE_|DS0PR11MB6397:EE_ X-MS-Office365-Filtering-Correlation-Id: b3117594-75c3-46d8-f01a-08dbfd0e22ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W+d2MOgQQgeXsPAcWM170x5k/vCK1aC9eA07ItwcTmpSXOppg712T3d07GoYOSE/Pty4M1/roVMFQ6v1kj3KOgU/4Rvem8Jk15PVj+OrTfhzKD7rrst2qLet77fz8hdoXeSiezN+yEtkiLPwJsaB8BJhWJYAi+IDUl9vezA5cBpsy0V73/3rhk2YIYQMfPmoOiQxrtsJQlQxWDQwMHcoSdwAnxXdn8pe129/X9hwcaGQMiLwvVVXbaFZHVgx0wEdkN53e5m7j3rcGrvUXj8lWdfIfH7Zkad37zG0Jqa7cWLT5oA5pcF/41x59iGL7q6OVJeJbEcYVyLI9rBfSNht7JU11iwZqqZxdff6Qip6TDBDbi7LOHacKzOd0z3x90BQPPrzNY6fbbpUQ86bgh6fd5o/EXf3lMGwcbrs/wkNZEq25+gaNBc8hUEOgAdCcUKCCWDOfWcBPKZKTbPrG4fPTCZpuugivQKI0n/OkQKI+iHGI0f5gKfpO0a47K5teMGmDGdLBLW/VEn9lHx2xqWNfq3MxLUyswSy0DIpziHPlcujdU7qPZm7BOL4xc5Mxf87JVavxab7T+HSNElQ6hv6YeAovE4ixhAmy49IoSy6SKqfqC1SAM/ok/fU5ywG1lTX+pChXzV8XYMepDkebi2ttOBNwHTDv5t64ikI91LBQSPiPr2GeWwcb7SNHnC+W1YcNoZJpi7hlRvaGdbGma/Mhw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR11MB7484.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(346002)(136003)(366004)(396003)(39850400004)(376002)(230922051799003)(451199024)(186009)(1800799012)(64100799003)(6916009)(53546011)(52116002)(316002)(6506007)(2616005)(6666004)(478600001)(66946007)(66556008)(66476007)(966005)(6486002)(6512007)(38100700002)(1076003)(86362001)(8676002)(8936002)(26005)(30864003)(5660300002)(2906002)(36756003)(41300700001)(38350700005)(44832011)(83380400001)(46800400005)(21314003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AfxfuiMeXRIvrOrFuTxGbEHKRYAE7aSzzT3jnBRNa+IJf1Y/rrUDxOLdWSAZWAOnhnlvKiT1ck15KztNVJWlu2XxUpr/VM941lFq/I9WG0KisfiFV+QHMajmz+Sd1o5Hb1F1yr9KunQd0J+Ruy+BTvJa3oOmjLfYsFXuqW3DTTUaxWgCgVUzXTZD0DZIdTlrT33POoF9JAwODJUD7xh8HiRzSjFh1YjmMjTdzpXq078qItQylwumvQ4yZxwL7rJlADekrCYNbzfSkN/9qqT8NGJJ6zpdbvjclEZB82FDC/UZHH1XO4CndO9FLyzgx83G+yHPhfRNVOOY1bho1q2gEdkiKQOCLm+p+o5yDnOJ/2OuqGJG3lhP8roSFJj9gCDgeA+JGzAX8Ch1sG/Ro83UTSFyGk9DkOZdL0YxFfI4ylWy4RK4nb33DYbxUOft2wCeNHRNY5KBFovfbttSPGrIgKtIFBgUps9zOdzBEcuuArAv0fCEqGu03/wQBUPXnXbOoX3zFGE71qQdTWRp0XfVJif35uDBB3oF4j+z8ZWiTH6J9m7CqmnyB0c6/pKXFwynCKOlgzLiftD8++z0Dq+EpXb4y0QlZ4kcM6J3C6NfmDuu+zzZVAOx32HkiAMKp9E6sUAfpq+S+OFFYNqtcMLALTYQ+xUCPwZKeDwt9d7Scdajl7qU6LqnZJslaVgYf1JpbTT6lKVHxIt9BiQYRIy3a7g27IcwPlk9V22JtfiE3sO6EDeu4HZh2zi25Q3uyTA4XMjiliXIwZH88LwOKpGlU9FKjBPsRnctuZtXkgKjRB9wrccTD/fyFdmeIbidUIHtMjmxLZPtLWkjLhE2K3rPzUYeHuBplYU4mR1ZCdD3D1fnq5RlX3zowr+02MWuH16WY439jYg2fgkSAU7Ctu417UCDz/oj+5GhKP8VdoRGhk/nnLLLw7u5GT1sw0RZXxVu79Lp3UMGI4mmEzVfa5YwjiHaT4p1/LVSU3zYKY/1em5UnVWBUe+zSEgbxpd7kZ4ydFAglHsgVTYkLFzvTO5xlPLgk7Lan7zvDU7+l3b8bi/lTkeNfzf7OfXE5ixi6YpAEH5cydOpMNxN5XnXksdRq/tAqUUAmoIbFy0cx01dCQilukP6UeLhxhsFq/K71UOWa3RQ7WoN8TMrLvX+9QxloHH1sWR1l6MqmMIBHgbpqeiMxv0Cf7AZXEqm7YdHzbgGVoZ+ssfxt9bxbv3pQ36xxHNSXKRRbH3QcyfBBrkBYnE2sVEKbYCFsuT0wp4+0UNjep1MbGqMMcwv/DJayWjVWAPYbquw67ZdM4mTtMTv95VJ6m8k5OGV88GaRXfUX+O++V27NYuvu2lHBVdPfA5Zlun07XTehXaAZ3lKY+d7Fe1c2T3uRi9rirrR75kJwhbxbMIV3fgmwaXZryab2I/StN4bBFkItxj5lb5sAADmuoG2ChiPKW8rIW5vQRViJdT2Ty3u5MdUL8I3zkcLmbOQjvNSg+g4SUQQeDeq0SIwdUNwQjMhKqlQZ90XNVKLacn9p+DhX1cliXZkLx2UzSR9sOkL76rPOcMMlmTlU5ZcnFazqIg+OlioTOrG6JFAyZgJ X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3117594-75c3-46d8-f01a-08dbfd0e22ea X-MS-Exchange-CrossTenant-AuthSource: DS0PR11MB7484.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2023 01:35:36.3156 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: H48k8Nx86x48PutPY0VQV+s4DfieHTK6SUdh/aMc5U8yWFYmF0SBOUoM4UtftG3RmxKPs1/qSQ2pkwtk6vi/yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB6397 X-Proofpoint-ORIG-GUID: S8MAAS0ZJ6ODfrRXnp_QXEBZEVraAPOH X-Proofpoint-GUID: S8MAAS0ZJ6ODfrRXnp_QXEBZEVraAPOH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-16_25,2023-11-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 phishscore=0 adultscore=0 suspectscore=0 spamscore=0 mlxscore=0 priorityscore=1501 malwarescore=0 mlxlogscore=999 impostorscore=0 clxscore=1011 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2311290000 definitions=main-2312150010 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 15 Dec 2023 01:35:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/107479 Release Notes: https://github.com/vmware/open-vm-tools/blob/stable-12.3.5/ReleaseNotes.md ChangeLog: https://github.com/vmware/open-vm-tools/blob/stable-12.3.5/open-vm-tools/ChangeLog Signed-off-by: Yi Zhao --- ...-Add-resolv_compat.h-for-musl-builds.patch | 4 +- ...1-configure.ac-don-t-use-dnet-config.patch | 4 +- ...e-configure-test-for-struct-timespec.patch | 8 +- ...finition-of-ALLPERMS-and-ACCESSPERMS.patch | 8 +- ...-test-for-feature-instead-of-platfor.patch | 21 +-- ...onfigure-test-for-sys-stat.h-include.patch | 8 +- ...6-Fix-subdir-objects-configure-error.patch | 8 +- ...include-poll.h-instead-of-sys-poll.h.patch | 8 +- .../0008-Rename-poll.h-to-vm_poll.h.patch | 16 +- ...strerror_r-unless-on-gnu-libc-system.patch | 6 +- ...10-Use-uintmax_t-for-handling-rlim_t.patch | 10 +- ...011-Use-off64_t-instead-of-__off64_t.patch | 3 +- ...ux-Consider-64bit-time_t-possibility.patch | 8 +- ...ools-Correct-include-path-for-poll.h.patch | 5 +- ...-Portable-way-to-print-64bit-time_t.patch} | 5 +- .../open-vm-tools/CVE-2023-20867.patch | 163 ------------------ ...ools_12.1.5.bb => open-vm-tools_12.3.5.bb} | 7 +- 17 files changed, 66 insertions(+), 226 deletions(-) rename meta-networking/recipes-support/open-vm-tools/open-vm-tools/{0001-timeSync-Portable-way-to-print-64bit-time_t.patch => 0014-timeSync-Portable-way-to-print-64bit-time_t.patch} (97%) delete mode 100644 meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch rename meta-networking/recipes-support/open-vm-tools/{open-vm-tools_12.1.5.bb => open-vm-tools_12.3.5.bb} (96%) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch index 4a97c2618..96270f860 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-Add-resolv_compat.h-for-musl-builds.patch @@ -1,4 +1,4 @@ -From c1ee0b0a0a05379d0e6475dfceaaf41876192640 Mon Sep 17 00:00:00 2001 +From 148aadcc1b61da6f6b9ee4bcd35c38b7fbaeb8a8 Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Wed, 14 Apr 2021 10:24:52 -0400 Subject: [PATCH] Add resolv_compat.h for musl builds @@ -17,7 +17,7 @@ Signed-off-by: Trevor Gamblin create mode 100644 open-vm-tools/lib/nicInfo/resolv_compat.h diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c -index c56b73cfe..8ae3b2f74 100644 +index 6f20547b2..f5064a9c0 100644 --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c @@ -70,6 +70,10 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch index 3aa21e3ec..69c825311 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-configure.ac-don-t-use-dnet-config.patch @@ -1,4 +1,4 @@ -From c953564b9f029b31381a2c630b47133ffe6a33e7 Mon Sep 17 00:00:00 2001 +From 547d05ca417c6b75ad06bf3119e1df8869742a70 Mon Sep 17 00:00:00 2001 From: Martin Kelly Date: Fri, 7 Apr 2017 15:20:30 -0700 Subject: [PATCH] configure.ac: don't use dnet-config @@ -15,7 +15,7 @@ Signed-off-by: Martin Kelly 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 3c058135a..124781f99 100644 +index 26bfdb682..9e2a1d6e3 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac @@ -1227,7 +1227,7 @@ if test "$with_dnet" = "yes"; then diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch index c6af3d5ff..1029252c7 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0002-Use-configure-test-for-struct-timespec.patch @@ -1,4 +1,4 @@ -From 6384b37cdef4ea868c3cee27bb627e4cfbab7b50 Mon Sep 17 00:00:00 2001 +From 74ab6b05fcba32031255624a31676e2aa0db133f Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 18 Nov 2015 09:03:00 +0000 Subject: [PATCH] Use configure test for struct timespec @@ -6,16 +6,16 @@ Subject: [PATCH] Use configure test for struct timespec Use the configure script to test for struct time spec instead of trying to keep track of what platforms has it. -Signed-off-by: Natanael Copa ---- Upstream-Status: Pending +Signed-off-by: Natanael Copa +--- open-vm-tools/configure.ac | 1 + open-vm-tools/lib/include/hgfsUtil.h | 8 +------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 124781f99..05f37f275 100644 +index 9e2a1d6e3..2f34f6eda 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac @@ -1441,6 +1441,7 @@ AC_TYPE_OFF_T diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch index 4b6e089ac..b4bd646d6 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0003-Fix-definition-of-ALLPERMS-and-ACCESSPERMS.patch @@ -1,4 +1,4 @@ -From 6be6cda5aea42b951212ec5f8a72778b1ef9c2da Mon Sep 17 00:00:00 2001 +From ef466581b53a1e64f53d4839bdacfab1d65cc6b9 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 18 Nov 2015 09:10:14 +0000 Subject: [PATCH] Fix definition of ALLPERMS and ACCESSPERMS @@ -8,16 +8,16 @@ assume it is not there instead of testing for specific implementations. This is needed for musl libc. -Signed-off-by: Natanael Copa ---- Upstream-Status: Pending +Signed-off-by: Natanael Copa +--- open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 8 +++++--- open-vm-tools/services/plugins/dndcp/dnd/dndLinux.c | 3 +-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index 63c4e65f0..87d419a7b 100644 +index 4a0bc9378..6ed49e2b7 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c @@ -105,11 +105,13 @@ typedef struct DirectoryEntry { diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch index 9fe0126d3..f23235e90 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0004-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -1,4 +1,4 @@ -From 9d22fba096cd77101fc45420c918ec748d2cc31b Mon Sep 17 00:00:00 2001 +From 4462efefdd61bff1e39e946b917b01433898be88 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 18 Nov 2015 10:05:07 +0000 Subject: [PATCH] Use configure to test for feature instead of platform @@ -18,20 +18,20 @@ The features we test for are: This is needed for musl libc. +Upstream-Status: Pending + Refit patch of open-vm-tools/lib/nicInfo/nicInfoPosix.c Signed-off-by: Natanael Copa Signed-off-by: Randy MacLeod --- -Upstream-Status: Pending - open-vm-tools/configure.ac | 4 ++++ open-vm-tools/lib/misc/idLinux.c | 30 +++++++++++------------- open-vm-tools/lib/nicInfo/nicInfoPosix.c | 6 ++++- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 05f37f275..9a0c63cf6 100644 +index 2f34f6eda..daa0939c3 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac @@ -1169,6 +1169,7 @@ AC_CHECK_FUNCS( @@ -57,7 +57,7 @@ index 05f37f275..9a0c63cf6 100644 AC_CHECK_HEADERS([sys/io.h]) AC_CHECK_HEADERS([sys/param.h]) # Required to make the sys/user.h check work correctly on FreeBSD diff --git a/open-vm-tools/lib/misc/idLinux.c b/open-vm-tools/lib/misc/idLinux.c -index 1bb86f483..41c670cfc 100644 +index 3d7d1e303..0e12ac5bd 100644 --- a/open-vm-tools/lib/misc/idLinux.c +++ b/open-vm-tools/lib/misc/idLinux.c @@ -27,12 +27,9 @@ @@ -74,7 +74,7 @@ index 1bb86f483..41c670cfc 100644 #ifdef __APPLE__ #include #include -@@ -1025,31 +1022,32 @@ Id_EndSuperUser(uid_t uid) // IN: +@@ -1025,24 +1022,23 @@ Id_EndSuperUser(uid_t uid) // IN: static Bool IdIsSetUGid(void) { @@ -108,10 +108,11 @@ index 1bb86f483..41c670cfc 100644 +#elif HAVE___SECURE_GETENV static const char envName[] = "VMW_SETUGID_TEST"; - if (setenv(envName, "1", TRUE) == -1) { - return TRUE; /* Conservative */ + /* +@@ -1062,7 +1058,9 @@ IdIsSetUGid(void) + return secure_getenv(envName) == NULL; } - return __secure_getenv(envName) == NULL; + return TRUE; -#endif +#else + /* Android does not have a secure_getenv, so be conservative. */ @@ -120,7 +121,7 @@ index 1bb86f483..41c670cfc 100644 } #endif diff --git a/open-vm-tools/lib/nicInfo/nicInfoPosix.c b/open-vm-tools/lib/nicInfo/nicInfoPosix.c -index de57a4a90..c56b73cfe 100644 +index 0135e6a09..6f20547b2 100644 --- a/open-vm-tools/lib/nicInfo/nicInfoPosix.c +++ b/open-vm-tools/lib/nicInfo/nicInfoPosix.c @@ -35,9 +35,13 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch index ec9aa7d2e..fda4c37e5 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0005-Use-configure-test-for-sys-stat.h-include.patch @@ -1,19 +1,19 @@ -From 2bc09bc7d933bc3d91c687e1cc2befdaa38d2c86 Mon Sep 17 00:00:00 2001 +From 79675399124b61f4e3da1f64f4b265f83dd26cdc Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 18 Nov 2015 10:41:01 +0000 Subject: [PATCH] Use configure test for sys/stat.h include This is needed for musl libc. -Signed-off-by: Natanael Copa ---- Upstream-Status: Pending +Signed-off-by: Natanael Copa +--- open-vm-tools/services/plugins/vix/vixTools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c -index 34f3125d2..cebf4dd8d 100644 +index 75d24a29e..d11c42178 100644 --- a/open-vm-tools/services/plugins/vix/vixTools.c +++ b/open-vm-tools/services/plugins/vix/vixTools.c @@ -66,7 +66,7 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch index e83fb3621..4c6f6ce02 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0006-Fix-subdir-objects-configure-error.patch @@ -1,19 +1,19 @@ -From dbe0943011c24d48de3df5a95f4e4606be0ef250 Mon Sep 17 00:00:00 2001 +From 37ad9845b5b8ab7170a2aaba31a505b2a36ba0f8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 13 Jun 2018 23:48:04 -0700 Subject: [PATCH] Fix subdir objects configure error Fix build on musl while here -Signed-off-by: Khem Raj ---- Upstream-Status: Pending +Signed-off-by: Khem Raj +--- open-vm-tools/configure.ac | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/open-vm-tools/configure.ac b/open-vm-tools/configure.ac -index 9a0c63cf6..5845490f6 100644 +index daa0939c3..497e9459a 100644 --- a/open-vm-tools/configure.ac +++ b/open-vm-tools/configure.ac @@ -326,7 +326,6 @@ AC_ARG_ENABLE( diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch index 7eac04ab5..fc0ce961c 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0007-include-poll.h-instead-of-sys-poll.h.patch @@ -1,19 +1,19 @@ -From 8c7f5895ed1f98bfc4101f8cfb93af3d13fd6bce Mon Sep 17 00:00:00 2001 +From d138b808a8b47a02a370b411149ef8ce7883ca6f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 13 Jun 2018 23:02:50 -0700 Subject: [PATCH] include poll.h instead of sys/poll.h including sys/poll.h is deprecated -Signed-off-by: Khem Raj ---- Upstream-Status: Pending +Signed-off-by: Khem Raj +--- open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c -index 2bf97b549..b285c59c6 100644 +index 26aee553a..4f413db73 100644 --- a/open-vm-tools/lib/asyncsocket/asyncsocket.c +++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c @@ -70,8 +70,8 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch index d9000b4f1..265476709 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0008-Rename-poll.h-to-vm_poll.h.patch @@ -1,4 +1,4 @@ -From 0c695d910b3e136e116cdbe0bfc6231dfac255a1 Mon Sep 17 00:00:00 2001 +From e86d7b309bdf5b7c6c38faeded157e220d4ccc78 Mon Sep 17 00:00:00 2001 From: Randy MacLeod Date: Wed, 24 Mar 2021 16:21:35 -0400 Subject: [PATCH] Rename poll.h to vm_poll.h @@ -13,12 +13,12 @@ we rename poll.h to vm_poll.h. Update for open-vm-tools-11.2.5. +Upstream-Status: Pending + Signed-off-by: Natanael Copa Signed-off-by: Khem Raj Signed-off-by: Randy MacLeod --- -Upstream-Status: Pending - open-vm-tools/lib/asyncsocket/asyncsocket.c | 2 +- open-vm-tools/lib/hgfsServer/hgfsServer.c | 2 +- open-vm-tools/lib/include/asyncsocket.h | 2 +- @@ -29,7 +29,7 @@ Upstream-Status: Pending rename open-vm-tools/lib/include/{poll.h => vm_poll.h} (99%) diff --git a/open-vm-tools/lib/asyncsocket/asyncsocket.c b/open-vm-tools/lib/asyncsocket/asyncsocket.c -index b285c59c6..5c528820d 100644 +index 4f413db73..684008d34 100644 --- a/open-vm-tools/lib/asyncsocket/asyncsocket.c +++ b/open-vm-tools/lib/asyncsocket/asyncsocket.c @@ -87,7 +87,7 @@ @@ -42,7 +42,7 @@ index b285c59c6..5c528820d 100644 #include "err.h" #include "hostinfo.h" diff --git a/open-vm-tools/lib/hgfsServer/hgfsServer.c b/open-vm-tools/lib/hgfsServer/hgfsServer.c -index 98f5b3f06..b436f0c7e 100644 +index c7b4cdd0f..d6e0cdc0e 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServer.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c @@ -51,7 +51,7 @@ @@ -55,10 +55,10 @@ index 98f5b3f06..b436f0c7e 100644 #include "vm_basic_asm.h" #include "unicodeOperations.h" diff --git a/open-vm-tools/lib/include/asyncsocket.h b/open-vm-tools/lib/include/asyncsocket.h -index dad848093..b61a2561f 100644 +index 09947002e..3800f5971 100644 --- a/open-vm-tools/lib/include/asyncsocket.h +++ b/open-vm-tools/lib/include/asyncsocket.h -@@ -171,7 +171,7 @@ typedef struct AsyncSocket AsyncSocket; +@@ -177,7 +177,7 @@ typedef struct AsyncSocket AsyncSocket; * Or the client can specify its favorite poll class and locking behavior. * Use of IVmdbPoll is only supported for regular sockets and for Attach. */ @@ -97,7 +97,7 @@ index ade356b9f..8759fb960 100644 #endif #ifdef __ANDROID__ diff --git a/open-vm-tools/lib/rpcIn/rpcin.c b/open-vm-tools/lib/rpcIn/rpcin.c -index 8b1fe759d..f22fcd402 100644 +index f1709fe03..c1a5dfdba 100644 --- a/open-vm-tools/lib/rpcIn/rpcin.c +++ b/open-vm-tools/lib/rpcIn/rpcin.c @@ -57,7 +57,7 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch index 980019492..a6638adb9 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0009-use-posix-strerror_r-unless-on-gnu-libc-system.patch @@ -1,12 +1,12 @@ -From 921621a098f242953117747f5852d7e3136ae6c4 Mon Sep 17 00:00:00 2001 +From 666a043be7d6fe07a36599260f7214cbd29a79e7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 13 Jun 2018 23:16:53 -0700 Subject: [PATCH] use posix strerror_r unless on gnu libc system -Signed-off-by: Khem Raj ---- Upstream-Status: Pending +Signed-off-by: Khem Raj +--- open-vm-tools/lib/err/errPosix.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch index d3c9149f7..6d0f8a3ae 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0010-Use-uintmax_t-for-handling-rlim_t.patch @@ -1,4 +1,4 @@ -From b44d1d4e4ba77f1d9cf7de73a3bd210d02b5ff36 Mon Sep 17 00:00:00 2001 +From b294005f3748c6caee002fd7588964f7bf9b1d09 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 24 Mar 2021 17:26:53 -0400 Subject: [PATCH] Use uintmax_t for handling rlim_t @@ -7,22 +7,22 @@ rlimit types are not representable with long or long long formats, therefore use uintmax_t to typecast rlim_t types and use %j to print it +Upstream-Status: Pending + Refit patch for open-vm-tools-11.2.5. Signed-off-by: Khem Raj Signed-off-by: Randy MacLeod Signed-off-by: Trevor Gamblin --- -Upstream-Status: Pending - open-vm-tools/lib/hgfsServer/hgfsServerLinux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index 87d419a7b..f5cc80b76 100644 +index 6ed49e2b7..0cc7c4094 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -5301,8 +5301,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: +@@ -5294,8 +5294,8 @@ HgfsWriteCheckIORange(off_t offset, // IN: goto exit; } diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch index 98eecebcf..c6ab4d44d 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0011-Use-off64_t-instead-of-__off64_t.patch @@ -1,4 +1,4 @@ -From 39a59ab7efe98c880c783b2ccf43e5a137d2b222 Mon Sep 17 00:00:00 2001 +From a8ef33b0623ba3494594a040ff5c77771168fdd6 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 27 Aug 2018 23:22:21 -0700 Subject: [PATCH] Use off64_t instead of __off64_t @@ -7,6 +7,7 @@ Fixes unknown type name '__off64_t' Upstream-Status: Pending + Signed-off-by: Khem Raj --- open-vm-tools/lib/file/fileIOPosix.c | 4 ++-- diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch index c7e62da7e..388857fc1 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch @@ -1,4 +1,4 @@ -From 859c21b9a21c53d936301b05044d0c649d6cf32b Mon Sep 17 00:00:00 2001 +From 2904454f3408a3abe3f2b0681504a66ea5ce713c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 24 Mar 2021 17:36:26 -0400 Subject: [PATCH] hgfsServerLinux: Consider 64bit time_t possibility @@ -15,15 +15,15 @@ Signed-off-by: Trevor Gamblin 1 file changed, 14 deletions(-) diff --git a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -index f5cc80b76..5a79d6451 100644 +index 0cc7c4094..445a53881 100644 --- a/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c +++ b/open-vm-tools/lib/hgfsServer/hgfsServerLinux.c -@@ -2566,20 +2566,6 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information +@@ -2559,20 +2559,6 @@ HgfsStatToFileAttr(struct stat *stats, // IN: stat information LOG(4, "%s: done, permissions %o%o%o%o, size %"FMT64"u\n", __FUNCTION__, attr->specialPerms, attr->ownerPerms, attr->groupPerms, attr->otherPerms, attr->size); -#ifdef __FreeBSD__ --# if !defined(VM_X86_64) && !defined(VM_ARM_64) && __FreeBSD_version >= 500043 +-# if !defined(VM_X86_64) && !defined(VM_ARM_64) -# define FMTTIMET "" -# else -# define FMTTIMET "l" diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch index 83687460b..f2f6893db 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0013-open-vm-tools-Correct-include-path-for-poll.h.patch @@ -1,4 +1,4 @@ -From 7f7e00ce582d72013cb54278548d3320e032b0dc Mon Sep 17 00:00:00 2001 +From eae0a65a9d6c9df20d05b4208aee23656915480b Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 7 Feb 2022 13:32:32 -0800 Subject: [PATCH] open-vm-tools: Correct include path for poll.h @@ -13,13 +13,14 @@ Fixes | 1 error generated. Upstream-Status: Pending + Signed-off-by: Khem Raj --- open-vm-tools/services/plugins/gdp/gdpPlugin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-vm-tools/services/plugins/gdp/gdpPlugin.c b/open-vm-tools/services/plugins/gdp/gdpPlugin.c -index 2bba2937e..025339595 100644 +index 96e6d717b..0b8a583b8 100644 --- a/open-vm-tools/services/plugins/gdp/gdpPlugin.c +++ b/open-vm-tools/services/plugins/gdp/gdpPlugin.c @@ -32,7 +32,7 @@ diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch similarity index 97% rename from meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch rename to meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch index 4a4fae116..39eea767a 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0001-timeSync-Portable-way-to-print-64bit-time_t.patch +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/0014-timeSync-Portable-way-to-print-64bit-time_t.patch @@ -1,4 +1,4 @@ -From dcb5d3e5d47b1e01fdcde575badc51825d4f4681 Mon Sep 17 00:00:00 2001 +From 09cc01b2fa15e319afafa13d7365b399a60f443c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 3 Jan 2023 13:36:01 -0800 Subject: [PATCH] timeSync: Portable way to print 64bit time_t @@ -12,6 +12,7 @@ pllLinux.c:43:20: error: format specifies type 'long' but the argument has type | ^~~~~~~~~~ Upstream-Status: Submitted [https://github.com/vmware/open-vm-tools/pull/631] + Signed-off-by: Khem Raj --- open-vm-tools/services/plugins/timeSync/pllLinux.c | 8 ++++---- @@ -50,5 +51,5 @@ index 1ab6e3584..0c304b5d7 100644 return TRUE; } -- -2.39.0 +2.25.1 diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch b/meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch deleted file mode 100644 index 170dddf68..000000000 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools/CVE-2023-20867.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 3028cdd4c0b2461b904cbe5a5868c8e591aa0941 Mon Sep 17 00:00:00 2001 -From: John Wolfe -Date: Mon, 8 May 2023 19:04:57 -0700 -Subject: [PATCH] Remove some dead code. - -Address CVE-2023-20867. -Remove some authentication types which were deprecated long -ago and are no longer in use. These are dead code. - -CVE: CVE-2023-20867 - -Upstream-Status: Backport -[https://github.com/vmware/open-vm-tools/blob/CVE-2023-20867.patch/2023-20867-Remove-some-dead-code.patch] - -Signed-off-by: Yi Zhao ---- - open-vm-tools/services/plugins/vix/vixTools.c | 102 -------------------------- - 1 file changed, 102 deletions(-) - -diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c -index 9f376a7..85c5ba7 100644 ---- a/open-vm-tools/services/plugins/vix/vixTools.c -+++ b/open-vm-tools/services/plugins/vix/vixTools.c -@@ -254,8 +254,6 @@ char *gImpersonatedUsername = NULL; - #define VIX_TOOLS_CONFIG_API_AUTHENTICATION "Authentication" - #define VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS "InfrastructureAgents" - --#define VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT TRUE -- - /* - * The switch that controls all APIs - */ -@@ -730,9 +728,6 @@ VixError GuestAuthSAMLAuthenticateAndImpersonate( - - void GuestAuthUnimpersonate(); - --static Bool VixToolsCheckIfAuthenticationTypeEnabled(GKeyFile *confDictRef, -- const char *typeName); -- - #if SUPPORT_VGAUTH - - VGAuthError TheVGAuthContext(VGAuthContext **ctx); -@@ -8013,29 +8008,6 @@ VixToolsImpersonateUser(VixCommandRequestHeader *requestMsg, // IN - userToken); - break; - } -- case VIX_USER_CREDENTIAL_ROOT: -- { -- if ((requestMsg->requestFlags & VIX_REQUESTMSG_HAS_HASHED_SHARED_SECRET) && -- !VixToolsCheckIfAuthenticationTypeEnabled(gConfDictRef, -- VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS)) { -- /* -- * Don't accept hashed shared secret if disabled. -- */ -- g_message("%s: Requested authentication type has been disabled.\n", -- __FUNCTION__); -- err = VIX_E_GUEST_AUTHTYPE_DISABLED; -- goto done; -- } -- } -- // fall through -- -- case VIX_USER_CREDENTIAL_CONSOLE_USER: -- err = VixToolsImpersonateUserImplEx(NULL, -- credentialType, -- NULL, -- loadUserProfile, -- userToken); -- break; - case VIX_USER_CREDENTIAL_NAME_PASSWORD: - case VIX_USER_CREDENTIAL_NAME_PASSWORD_OBFUSCATED: - case VIX_USER_CREDENTIAL_NAMED_INTERACTIVE_USER: -@@ -8205,36 +8177,6 @@ VixToolsImpersonateUserImplEx(char const *credentialTypeStr, // IN - } - - /* -- * If the VMX asks to be root, then we allow them. -- * The VMX will make sure that only it will pass this value in, -- * and only when the VM and host are configured to allow this. -- */ -- if ((VIX_USER_CREDENTIAL_ROOT == credentialType) -- && (thisProcessRunsAsRoot)) { -- *userToken = PROCESS_CREATOR_USER_TOKEN; -- -- gImpersonatedUsername = Util_SafeStrdup("_ROOT_"); -- err = VIX_OK; -- goto quit; -- } -- -- /* -- * If the VMX asks to be root, then we allow them. -- * The VMX will make sure that only it will pass this value in, -- * and only when the VM and host are configured to allow this. -- * -- * XXX This has been deprecated XXX -- */ -- if ((VIX_USER_CREDENTIAL_CONSOLE_USER == credentialType) -- && ((allowConsoleUserOps) || !(thisProcessRunsAsRoot))) { -- *userToken = PROCESS_CREATOR_USER_TOKEN; -- -- gImpersonatedUsername = Util_SafeStrdup("_CONSOLE_USER_NAME_"); -- err = VIX_OK; -- goto quit; -- } -- -- /* - * If the VMX asks us to run commands in the context of the current - * user, make sure that the user who requested the command is the - * same as the current user. -@@ -10917,50 +10859,6 @@ VixToolsCheckIfVixCommandEnabled(int opcode, // IN - /* - *----------------------------------------------------------------------------- - * -- * VixToolsCheckIfAuthenticationTypeEnabled -- -- * -- * Checks to see if a given authentication type has been -- * disabled via the tools configuration. -- * -- * Return value: -- * TRUE if enabled, FALSE otherwise. -- * -- * Side effects: -- * None -- * -- *----------------------------------------------------------------------------- -- */ -- --static Bool --VixToolsCheckIfAuthenticationTypeEnabled(GKeyFile *confDictRef, // IN -- const char *typeName) // IN --{ -- char authnDisabledName[64]; // Authentication..disabled -- gboolean disabled; -- -- Str_Snprintf(authnDisabledName, sizeof(authnDisabledName), -- VIX_TOOLS_CONFIG_API_AUTHENTICATION ".%s.disabled", -- typeName); -- -- ASSERT(confDictRef != NULL); -- -- /* -- * XXX Skip doing the strcmp() to verify the auth type since we only -- * have the one typeName (VIX_TOOLS_CONFIG_AUTHTYPE_AGENTS), and default -- * it to VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT. -- */ -- disabled = VMTools_ConfigGetBoolean(confDictRef, -- VIX_TOOLS_CONFIG_API_GROUPNAME, -- authnDisabledName, -- VIX_TOOLS_CONFIG_INFRA_AGENT_DISABLED_DEFAULT); -- -- return !disabled; --} -- -- --/* -- *----------------------------------------------------------------------------- -- * - * VixTools_ProcessVixCommand -- - * - * --- -2.6.2 - diff --git a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb similarity index 96% rename from meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb rename to meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb index 4873e9d89..5749285bb 100644 --- a/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.1.5.bb +++ b/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb @@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" LICENSE:modules/linux = "GPL-2.0-only" LICENSE:modules/solaris = "CDDL-1.0" -SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.1.x \ +SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.3.x \ file://tools.conf \ file://vmtoolsd.service \ file://vmtoolsd.init \ @@ -42,8 +42,7 @@ SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stabl file://0011-Use-off64_t-instead-of-__off64_t.patch;patchdir=.. \ file://0012-hgfsServerLinux-Consider-64bit-time_t-possibility.patch;patchdir=.. \ file://0013-open-vm-tools-Correct-include-path-for-poll.h.patch;patchdir=.. \ - file://0001-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ - file://CVE-2023-20867.patch;patchdir=.. \ + file://0014-timeSync-Portable-way-to-print-64bit-time_t.patch;patchdir=.. \ " UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P\d+(\.\d+)+)" @@ -51,7 +50,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P\d+(\.\d+)+)" SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ " -SRCREV = "30339ef6ded308f0147fe80f89b9bca3ace1aef9" +SRCREV = "1b362b9eb449fb5de3809aaea4a636ece30ee5b7" S = "${WORKDIR}/git/open-vm-tools"