From nobody Sun May 19 22:21:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+56829+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56829+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585734809; cv=none; d=zohomail.com; s=zohoarc; b=Pyg7UqNT5Np9IlaB+g2fBoeC/njjZmuIJDyRL+F8is8RPDO3eTeo1Y3G5vaDeNtRaL6CKWwKYm0hse0H3WPaOhOQuI1zhZZqLisMzLqdoAxi17q00fb4UjXx1AuzQGoA7tWiGRT8nDOJ7sXlh3vz+OiaQY4M755/gkIMMNBRExU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585734809; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=yugZ8jtTDzzRCs2b2Eal0jeo5ljH21JCInB3Hw4h/cY=; b=UuGH8xot2GVuRxY5TzD5j6FTSfXP0mg6EcUPkkNxTqIs0t6nCpyHuSmNQB6bsbKgwZ5IPJDJ1yGrqkIwe35xAB8UNN2pRqG3LCdPSTkFHoxyHo1fhBP3QtVG6dGRSMh9ZdbBzcGgCp/varpsF0xu2bXc2RrDAtyB7L1sqI3ZnGU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+56829+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 158573480919793.89526998046279; Wed, 1 Apr 2020 02:53:29 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id zRipYY1788612xIC1TvNCMrQ; Wed, 01 Apr 2020 02:53:28 -0700 X-Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.2857.1585734808109499177 for ; Wed, 01 Apr 2020 02:53:28 -0700 IronPort-SDR: 4ZioXFWINYtV0AUnf8LUA9kS0MMHkNbOWO+S3mvLydPMK1PIngRl0TrhxYuYuTh9t7usvvXgku l1y+QA0HG60w== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 02:53:27 -0700 IronPort-SDR: DGQ7YWUllp3dNtvqV6fi1i3bQEf++aqMbW6ShOwKqki06k6Ydv4e0qI6HtQiaIoxSkgyZqNqk9 hzoZYR2HUHsw== X-IronPort-AV: E=Sophos;i="5.72,331,1580803200"; d="scan'208";a="422656567" X-Received: from mrabeda-mobl.ger.corp.intel.com ([10.213.11.210]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2020 02:53:25 -0700 From: "Maciej Rabeda" To: devel@edk2.groups.io Cc: Jiaxin Wu , Siyuan Fu , Laszlo Ersek Subject: [edk2-devel] [PATCH] NetworkPkg/Ip6Dxe: Fix ASSERT logic in Ip6ProcessRouterAdvertise() Date: Wed, 1 Apr 2020 11:53:21 +0200 Message-Id: <20200401095321.1966-1-maciej.rabeda@linux.intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,maciej.rabeda@linux.intel.com X-Gm-Message-State: BIX0FR3wdw6MAaBW6nKRvVYBx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585734808; bh=2LnBZ9EXTMm2ObLLB97t2rRhoIQq1FOcqwMBpUZBrag=; h=Cc:Date:From:Reply-To:Subject:To; b=IdflPg0KWCdwlUNZlH8HfmCEQU8oJ14wQqFLrTmUKuaDE/PgGYsQAMnJoR14S+lKeDj 4p7CwszkVCoyYe16J5cqPMYJ9ItjmhQAzSZ8EgiJUYmf6CkRSoyVm0qrrsfWl+1AXRbQD gS6XeEe7d/m3atqVE9NntKNAKvGg5O7G0Mw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" This patch fixes reversed logic of recently added ASSERTs which should ensure that Ip6IsNDOptionValid() implementation properly reacts to invalid packets. Cc: Jiaxin Wu Cc: Siyuan Fu Signed-off-by: Maciej Rabeda Tested-by: Laszlo Ersek Reviewed-by: Siyuan Fu --- NetworkPkg/Ip6Dxe/Ip6Nd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NetworkPkg/Ip6Dxe/Ip6Nd.c b/NetworkPkg/Ip6Dxe/Ip6Nd.c index fd7f60b2f92c..0780a98cb325 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Nd.c +++ b/NetworkPkg/Ip6Dxe/Ip6Nd.c @@ -2111,7 +2111,7 @@ Ip6ProcessRouterAdvertise ( // Option size validity ensured by Ip6IsNDOptionValid(). // ASSERT (LinkLayerOption.Length !=3D 0); - ASSERT (Offset + (UINT32) LinkLayerOption.Length * 8 >=3D (UINT32) H= ead->PayloadLength); + ASSERT (Offset + (UINT32) LinkLayerOption.Length * 8 <=3D (UINT32) H= ead->PayloadLength); =20 ZeroMem (&LinkLayerAddress, sizeof (EFI_MAC_ADDRESS)); CopyMem (&LinkLayerAddress, LinkLayerOption.EtherAddr, 6); @@ -2164,7 +2164,7 @@ Ip6ProcessRouterAdvertise ( // Option size validity ensured by Ip6IsNDOptionValid(). // ASSERT (PrefixOption.Length =3D=3D 4); - ASSERT (Offset + (UINT32) PrefixOption.Length * 8 >=3D (UINT32) Head= ->PayloadLength); + ASSERT (Offset + (UINT32) PrefixOption.Length * 8 <=3D (UINT32) Head= ->PayloadLength); =20 PrefixOption.ValidLifetime =3D NTOHL (PrefixOption.ValidLifetime= ); PrefixOption.PreferredLifetime =3D NTOHL (PrefixOption.PreferredLife= time); @@ -2334,7 +2334,7 @@ Ip6ProcessRouterAdvertise ( // Option size validity ensured by Ip6IsNDOptionValid(). // ASSERT (MTUOption.Length =3D=3D 1); - ASSERT (Offset + (UINT32) MTUOption.Length * 8 >=3D (UINT32) Head->P= ayloadLength); + ASSERT (Offset + (UINT32) MTUOption.Length * 8 <=3D (UINT32) Head->P= ayloadLength); =20 // // Use IPv6 minimum link MTU 1280 bytes as the maximum packet size i= n order --=20 2.24.0.windows.2 -=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 (#56829): https://edk2.groups.io/g/devel/message/56829 Mute This Topic: https://groups.io/mt/72696739/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-