From nobody Sat Apr 27 16:52:16 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+56890+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+56890+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585818881; cv=none; d=zohomail.com; s=zohoarc; b=lMQbrGMx5oTfJL/+wrNjBD9deo1vDBfTCYlkkRFM6W1ybRhK4Dvgg1Jr4zr4tu9ElLNAyA5NUWKzP+pRn4PCl7d3LqLH4TtYik9JS5vQbuvnBHXLR3Jhbjy7HdDgMUT55ABYOojBX8+yIGX8lpnUT8kee/uR8/YX57oCazke1EE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585818881; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=mxXGCFvfvnm7iFSZVOFmvaYJoKpFtGzYObvH1UKZFsQ=; b=KU/4K4l/uemdDWwMIYQHsa7JbbCcudsI4HJyjWhmMgRtPwRuxGuPdqK6kaX9UGw/M+CAd4ACRDHHDzf4lwskIgGyTOPPnHnCVzA8xrWoH8pnvoPsTCj2yiKtzxHyk1mOgKOZ0CKjEFocPiS8yh4YAccI6J+4kGGOAkzwRBcu62c= 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+56890+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 1585818881126474.4839091391092; Thu, 2 Apr 2020 02:14:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id e70tYY1788612xSmMfmAHguf; Thu, 02 Apr 2020 02:14:40 -0700 X-Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web12.2450.1585818880058249275 for ; Thu, 02 Apr 2020 02:14:40 -0700 IronPort-SDR: aWrnqOkSsMWMt/9ce+cYIqb7No4wN1wtpIQFmjGEg0zpVTSdbrMmqeUTZbV2G3j4yWPd6HxHUI V8lZN01h1mvQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2020 02:14:39 -0700 IronPort-SDR: n+x3ifmKPqGypBi5LNC58ndfQjIIAGCoeKS+K26EFzjGrbz45wI5Tdo9aRRb6rC3WeBft8A0t2 Q+At+27qKeiw== X-IronPort-AV: E=Sophos;i="5.72,335,1580803200"; d="scan'208";a="252932860" X-Received: from mrabeda-mobl.ger.corp.intel.com ([10.213.18.84]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2020 02:14:38 -0700 From: "Maciej Rabeda" To: devel@edk2.groups.io Cc: Jiaxin Wu , Siyuan Fu , Laszlo Ersek Subject: [edk2-devel] [PATCH v2] NetworkPkg/Ip6Dxe: Fix ASSERT logic in Ip6ProcessRouterAdvertise() Date: Thu, 2 Apr 2020 11:14:34 +0200 Message-Id: <20200402091434.1668-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: 7ynkjwhEC887gnDZZDS0HQnzx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585818880; bh=bSFxEuADw04x+/bEPLdJYD1seTrpj7VNyWUfG3hWit8=; h=Cc:Date:From:Reply-To:Subject:To; b=Pz1A4omCazhDA+59kzoAH/rnP8rfexwJyssJuyOYwSH1zAJDFJrIEsq4ax0PmnilSvH kz3uU5nFD3xJWngTlLL78BmHVNOIs03J+aCehcKHblX6BDE1bXDG+Iv00UTx9AVRsu6aD rjLRTrJHwai9BAo9jg4LD2bHNsyORk3t3Iw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2655 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 Reviewed-by: Siyuan Fu Tested-by: Laszlo Ersek Fixes: 9c20342eed70ec99ec50cd73cb81804299f05403 Reviewed-by: Jiaxin Wu --- 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 (#56890): https://edk2.groups.io/g/devel/message/56890 Mute This Topic: https://groups.io/mt/72720827/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-