From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 2242F7803DE for ; Mon, 12 Feb 2024 17:14:18 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=DKPrsKvLnJsiYMIUwswU6YkziHgfBICjrPeMdn4azXQ=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1707758057; v=1; b=f8PzkTPL4sfdwPk2IW8WkiyBYi2Q4MZZgu/YasSqA+aXhq7aDsDCUJoqxoC8pxypeTUVznrE e9MZla6KZ+rWsHO+LLBsDR9zb9nJ8ySeZS4QTO+NpGeP0uvrKKZUl/U4CxNdoi4X7Fhe6eEJde8 ORZUWE/pSMVtp3uvBv9lfB5c= X-Received: by 127.0.0.2 with SMTP id JEOsYY7687511xFK1AVnGOJd; Mon, 12 Feb 2024 09:14:17 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.9]) by mx.groups.io with SMTP id smtpd.web10.12003.1707758057351571811 for ; Mon, 12 Feb 2024 09:14:17 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10982"; a="12472628" X-IronPort-AV: E=Sophos;i="6.06,264,1705392000"; d="scan'208";a="12472628" X-Received: from orviesa010.jf.intel.com ([10.64.159.150]) by fmvoesa103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Feb 2024 09:14:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,264,1705392000"; d="scan'208";a="2682498" X-Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by orviesa010.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Feb 2024 09:14:16 -0800 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 12 Feb 2024 09:14:15 -0800 X-Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Mon, 12 Feb 2024 09:14:15 -0800 X-Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Mon, 12 Feb 2024 09:14:15 -0800 X-Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.100) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Mon, 12 Feb 2024 09:14:14 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S68tlRTGTqvKJpJTmaD2aHghs/+CE2QpbULzCIg8KzJLFu3LbD2p0AkaDgFqOaKuFmX0baWGJqnShyzfWEMkRSqGcgWx66xAfVlZdxTYh19aLOjP0KaAyI6MVIei3HQj3xpMsLDyvqTf4cSQwAONYMdVXjP2TJOXQ/ch3jYxqASkJYbv7pHPi4n8PDqQ1caHEC0isz5kGYcRZIuo/xCMbnUoZH8x2Qk4bnNJAj4gJP8sK162+6ktA1OJnBNwh4klZbHW5zy5pexCpPxYcqb45jkzKiz3VCGt8e4j8FMCRgMohrRtsg2Cb2KjtbpXJp4j4+tfBKShnlLb7Gds0RvKKQ== 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=WCZMWNbxL+3LgUQSHP28CIMEiXeP0zi5KVinOow9T/U=; b=nWR6phBegGbgjETqhfds12CSBpRs9ZPfnpIlT+n697hL8ZTjMGZVU/+pBW60sA8J1mC2Kn1S6unDNcglJXd0aoiCQCcQ3ThLCRLuqVr7+B5dkhqnuXA7agMWzcoLKXXUjUG3HSPflBT7wxgS/NUdu5PIKKpY4QCHZ0b4dk/dKVgKY46GOmSf8DIgScFQ/qH24WL671jWR5BkaspFo0ezoIwp+Kg28RNww4MWeOoLJuYk60goLlFBsq/MjI2TIznoSD2pWn6GHzTGs1UG9bk4bXbLMYe6BYeIVd7DiC3001z8nalfaz5vPc40onIwBEqUjvinxA1Eeqnfy1H+jgi7+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from SN7PR11MB8281.namprd11.prod.outlook.com (2603:10b6:806:26b::20) by DM4PR11MB5295.namprd11.prod.outlook.com (2603:10b6:5:392::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.35; Mon, 12 Feb 2024 17:14:12 +0000 X-Received: from SN7PR11MB8281.namprd11.prod.outlook.com ([fe80::bf47:e473:3750:b81f]) by SN7PR11MB8281.namprd11.prod.outlook.com ([fe80::bf47:e473:3750:b81f%5]) with mapi id 15.20.7270.036; Mon, 12 Feb 2024 17:14:12 +0000 From: "Saloni Kasbekar" To: "Douglas Flick [MSFT]" , "devel@edk2.groups.io" CC: Doug Flick , "Clark-williams, Zachary" , Andrew Fish , "Leif Lindholm" , "Kinney, Michael D" Subject: Re: [edk2-devel] [PATCH 2/3] [edk2-stable202402] NetworkPkg: Dhcp6Dxe: Additional Code Cleanup Thread-Topic: [PATCH 2/3] [edk2-stable202402] NetworkPkg: Dhcp6Dxe: Additional Code Cleanup Thread-Index: AQHaW8WQ5egW5QqGD0OcjQ9xjLqujrEG9jyA Date: Mon, 12 Feb 2024 17:14:12 +0000 Message-ID: References: <25e7367bd09b43a4f4d9e084ad5019dcd1f28446.1707534069.git.doug.edk2@gmail.com> In-Reply-To: <25e7367bd09b43a4f4d9e084ad5019dcd1f28446.1707534069.git.doug.edk2@gmail.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SN7PR11MB8281:EE_|DM4PR11MB5295:EE_ x-ms-office365-filtering-correlation-id: 74cfbebe-7f78-4292-716d-08dc2bee0878 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: uI/xFW6oUyjh0xHj5Wda+ZwKuONGfrX6WccBlPJysFn3xO+K//rMq+SinOfIkMlOAwbHLBWaVMmYlMFybHvsK55/m5oP1Jp3hdqWpqxLruWD0oHcO5/Psw93DdpDz551RyR1u4x/INktvDJNekfi94dePRvWYv1+wNs4mwkvhSiU/sc1ukwe8c0dTFQsa+OpyuSON2qGhJ+3V4bSDHyQGdht4unDtszx8VFze1OoiQfEzmjmoxWejoA56yElWhRjdAclrONyDw7uw8H6huC4J0u82N8EiRkrUNiLLecJni4T5HZiCjCi88/f8bm3b0TQryhryCweFkuuQsTDgsor3RR5kqZN969u70e7nRJySi2SZlamJ25LcNi7rpEzd6Y4i+CRodD0zN6kedr09mTendZn7Qo+rg3Qergx8mJZo/LemmUztMB/X6uHJkTawpiDqxCqcoq26LXHb7E8Oo0Ji1qtY4R2+M8n2w1jy+NHzaklqEk7YTKDwkGbgjOy2xIBM5qSNm+oNOuNoCjCu438R8UbkBjdTqDVhMIc8mEKJsDmLOoXU2q8cBkIKLrSTKHpcbCWytE1BsF2MxLaB6g8bJ5ADE82xjG6h3hpeeJfVElPDfd0vd4QGQMDZt9susrq x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?qh9zLHaw4oH0nJyrTDrLeTA/HjaOU4l/95VYxcAEmCvkmfPCeWdXqfUe8qbu?= =?us-ascii?Q?9L/Ik9Ts3/3BUFVYK/rnuJS5w67fuipqwtY/p+wki9/5HVFvaXZRDNt0ht/a?= =?us-ascii?Q?Seo97ZAmfOjp6Qo9pdBxDKr4/Emdcbazjj4W2o4f49b8n15RYCXvXL7uKk2b?= =?us-ascii?Q?L2+q9NY9gK+LrfrcMsK8/WZVQciJkvzLpR9LSZ+utkDcV1ij3DfNqLNY6Wo2?= =?us-ascii?Q?nDu7N0gpzDAYlWTDFfc/qxAaYxMyWyaLyJisuyleqJSFvY7HpCRep3IACP/z?= =?us-ascii?Q?PkejWgvnbnZa5j5XIBOv39l4bT6GmTZM3fFYMhA3DUsvFLQmc8dObBQ7wVS+?= =?us-ascii?Q?jWe4WB9DnR4/m97PbdWUFJVCtnSYlV/2xCRAt9B7t4wb238AIY80ZNBiuhsX?= =?us-ascii?Q?6gpv2ZixsAQ73AHG4Jx9Z/kmIMf2WtFq73KpnEYfIQLbEnw08vr61bxhsHl9?= =?us-ascii?Q?1yIpU4XCE+vNI31qeLHMd/xlCbroFG1e8j/OLS5iEeBzk+V7C/9mQxIxNYof?= =?us-ascii?Q?Jdr8f6wrm/xyjkziqR4KwkM6ee0rgfCIHmN+qLJoRFmlD2mBGZqNJSxFzz3W?= =?us-ascii?Q?zZYp1jUe4ISqkT5I71UQsuedUzde/XxMCA9dE1xvzeuwospaBntRtHfCBp+f?= =?us-ascii?Q?IzmphguYAFO8GdCKOnaVszG5qtzhiGNLf0ZkBwc7Ffum/ZqAkEKNMlFgmkPz?= =?us-ascii?Q?YtCZiMSRWXrmlDvSzI99pamadz/pTG1DLHp8Fb7zvvPRivjgJKcI8YcdgQqQ?= =?us-ascii?Q?GZ/Pm0iY7njkD6p+HwdNRFZlyaRXZ/gX7SklP3XJxBSjTODaxmzDcDJJz+at?= =?us-ascii?Q?+qWPobS1JmAMVeHcPpJQWPr87Ee/b84WGF6rHiPY9UkFfWTkdWWRsz9BjoHn?= =?us-ascii?Q?EC1biNevoPv3zON7v5vFSWmGVrJ6r5J7RSqSc7jmsHfVosQDUY8cVWbvQePj?= =?us-ascii?Q?aUq/kyE+PuumwOd8jyxDolftwYCOs6/ceJly5UBGf8B3mxxt+aJY/Gl7vv9Q?= =?us-ascii?Q?FuhteJ3jqBW+lIElX42X2iZWuu1BkGdyp57hQK91tAxqpMM1dhavFfbJhBcy?= =?us-ascii?Q?EK72lcd9qviGzVJBWHaHDMqWYTY3w7rPLjBu5snJS343Bi2oDub2xL25mhwp?= =?us-ascii?Q?9S+jGyfHdhAo/mYJEnGMDyxsO2JcmbOcWJOFBnY22EJtyDWd7C/bp64drrKq?= =?us-ascii?Q?MpwP1zsM2GNFOiNf9U4eeXacpYwxiAyCU5hFVJoqE9xxgzMrsZRrljFBZTmG?= =?us-ascii?Q?EnEvehToGUFiniD186WTJqVMSTnpWPVv2m5B55NIv9jjD5KCh5BaQq6jBdu8?= =?us-ascii?Q?6VUtxYwTbYNxP6QK1omjwSTNPhksfi1XBBZAc0iCU9qICix9cjZVTvyyqNKi?= =?us-ascii?Q?cqQgnxOG797EeC4cEfIJ/FwM5dWtCCVlKrechaSj5b4wlYXgsmBLcRRL1nVE?= =?us-ascii?Q?oWJHa3/Yo/lqSQpL3Ql2r4dHLegMB5BjDRh+Wo45gL2Mv605caJBpkpYSmgU?= =?us-ascii?Q?MeNaQgSPgQtEX7M6gAS7KW7P4i9lK87xOSyFq8kbLEaah5ijssucE1KqJIkv?= =?us-ascii?Q?sSqBM9qT4fHexdzdzwgXujh5HmA6JSDJMKBVjjyy?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN7PR11MB8281.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74cfbebe-7f78-4292-716d-08dc2bee0878 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Feb 2024 17:14:12.3682 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: JWl8aKRReIYvU9XtcdF6znNtzGTi4WOWaRDQe6ZsjOllgcWIqu4dX44wDfP6/87U4Sii9yBqNTnrQpJvPdzCpSvPzttacoAFHL8z+jYbkJc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB5295 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,saloni.kasbekar@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: Apg9LxcRsEAgqHhCEIv5FH7xx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=f8PzkTPL; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Reviewed-by: Saloni Kasbekar -----Original Message----- From: Douglas Flick [MSFT] =20 Sent: Friday, February 9, 2024 7:05 PM To: devel@edk2.groups.io Cc: Doug Flick ; Kasbekar, Saloni ; Clark-williams, Zachary ; An= drew Fish ; Leif Lindholm ; Kin= ney, Michael D ; Doug Flick [MSFT] Subject: [PATCH 2/3] [edk2-stable202402] NetworkPkg: Dhcp6Dxe: Additional C= ode Cleanup From: Doug Flick Removes duplicate check after merge > > // > // Verify the PacketCursor is within the packet // if ( =20 > (*PacketCursor < Packet->Dhcp6.Option) > || (*PacketCursor >=3D Packet->Dhcp6.Option + (Packet->Size - sizeof (EFI_DHCP6_HEADER)))) > { > return EFI_INVALID_PARAMETER; > } > Additionally Calculates the Packet->Length before appending Cc: Saloni Kasbekar Cc: Zachary Clark-williams Cc: Andrew Fish Cc: Leif Lindholm Cc: Michael D Kinney Signed-off-by: Doug Flick [MSFT] --- NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c b/NetworkPkg/Dhcp6Dxe/Dhcp6= Utility.c index 705c665c519d..348602c4e1a8 100644 --- a/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c +++ b/NetworkPkg/Dhcp6Dxe/Dhcp6Utility.c @@ -657,15 +657,6 @@ Dhcp6AppendOption ( return EFI_BUFFER_TOO_SMALL; } - //- // Verify the PacketCursor is= within the packet- //- if ( (*PacketCursor < Packet->Dhcp6.Option)- = || (*PacketCursor >=3D Packet->Dhcp6.Option + (Packet->Size - sizeof (EFI_= DHCP6_HEADER))))- {- return EFI_INVALID_PARAMETER;- }- WriteUnaligne= d16 ((UINT16 *)*PacketCursor, OptType); *PacketCursor +=3D DHCP6_SIZE_OF_= OPT_CODE; WriteUnaligned16 ((UINT16 *)*PacketCursor, OptLen);@@ -929,6 +9= 20,11 @@ Dhcp6AppendIaOption ( *PacketCursor +=3D sizeof (T2); } + //+ // Update the packet lengt= h+ //+ Packet->Length +=3D BytesNeeded;+ // // Fill all the addresses= belong to the Ia //@@ -945,11 +941,6 @@ Dhcp6AppendIaOption ( // *Len =3D HTONS ((UINT16)(*PacketCursor - (UINT8 *)Len - 2)); - //-= // Update the packet length- //- Packet->Length +=3D BytesNeeded;- re= turn EFI_SUCCESS; } @@ -957,6 +948,7 @@ Dhcp6AppendIaOption ( Append the appointed Elapsed time option to Buf, and move Buf to the end= . @param[in, out] Packet A pointer to the packet, on success Pack= et->Length+ will be updated. @param[in, ou= t] PacketCursor The pointer in the packet, on success PacketCursor = will be moved to the end of the option. @param[i= n] Instance The pointer to the Dhcp6 instance.--=20 2.43.0 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115363): https://edk2.groups.io/g/devel/message/115363 Mute This Topic: https://groups.io/mt/104272127/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-