From nobody Fri May 3 22:29:37 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+56630+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+56630+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linux.intel.com ARC-Seal: i=1; a=rsa-sha256; t=1585571040; cv=none; d=zohomail.com; s=zohoarc; b=I2W6FgRVV4MoqQ2LxtYz8Gt6z2GY5F1PQzD9ffq0UNhUzOA23JlOOHmBwKAGKAffANjAEpyYSlk/8tJB37tgAoUnC8NmKJY7zuDimTqcR08WhgcmyoEp+B7p6iDr5IGd7G2MzLqml2PETmA0p4f2cl4Y4U4bVS1N93aurppQh2M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585571040; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=6fzMrPhPWKJPFluiIM74zYnM7MJNU5gFbHG4xbSpUFI=; b=EEhxunDRGPfSMvq7/eugtTv59X4eU5v8IisWhQdm/yCU4XgtVbjjZyefGs8jD0N9OpZDSFQzOUsXldObL3jY26hk6cOwS4Y6VHGZnva+4lAvRUb4fbBfLTp4LACC9RhqMTw55UAmG7iOKpdV0RgWKtDCWBGHGPau7xFCIkAYoWE= 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+56630+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 1585571039999957.1736261221882; Mon, 30 Mar 2020 05:23:59 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id UJkOYY1788612xoOSJ6tuntK; Mon, 30 Mar 2020 05:23:59 -0700 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web12.48646.1585571038721725891 for ; Mon, 30 Mar 2020 05:23:58 -0700 IronPort-SDR: hKWqGxH11mBiX0BCfc6sshAHkFHkSJOteS/W1cwIss3F2T1opr24xSzD8zFChit/caTZvalX2V 4Zl3njuqVJlA== 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 orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 05:23:58 -0700 IronPort-SDR: A3dCKMDqJfBc54Q0BfD2xOHH/rYQGPF5srNZeiCgy2VCqYqbo1D95pggRLdSCt+vTvNr38nbxY O6h68TNFRJQA== X-IronPort-AV: E=Sophos;i="5.72,324,1580803200"; d="scan'208";a="421910150" X-Received: from mrabeda-mobl.ger.corp.intel.com ([10.213.6.151]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 05:23:56 -0700 From: "Maciej Rabeda" To: devel@edk2.groups.io Cc: Jiaxin Wu , Siyuan Fu Subject: [edk2-devel] [PATCH v2] NetworkPkg/Ip6Dxe: Improve Neightbor Discovery message validation. Date: Mon, 30 Mar 2020 14:23:51 +0200 Message-Id: <20200330122351.1229-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: A5RkWGHjwVcHfaQOqOqW7IJYx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1585571039; bh=chvKINYIqzKFX7TS4qqO0Ci3y9yCbUXsDoUUBXzUVZY=; h=Cc:Date:From:Reply-To:Subject:To; b=o0X25eoiENy9jwMQLy6cBCVg/c8uTugEx6tL5TGUnohSdhumyxtFzkSzjFPFou6S5yG CHNe7n8JD3OgNYHjZNaL6vZSxmysVvrt917btyBIHalsZ3pLV2DH98CX6nBjB0KFYXpIo 4oWnEEABudzeXFwRmE8Qxa0LLp/qs8KmUjQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2174 Problem has been identified with Ip6ProcessRouterAdvertise() when Router Advertise packet contains options with malicious/invalid 'Length' field. This can lead to platform entering infinite loop when processing options from that packet. Cc: Jiaxin Wu Cc: Siyuan Fu Signed-off-by: Maciej Rabeda Reviewed-by: Siyuan Fu Tested-by: Laszlo Ersek --- NetworkPkg/Ip6Dxe/Ip6Nd.c | 44 +++++++++------ NetworkPkg/Ip6Dxe/Ip6Nd.h | 13 +++++ NetworkPkg/Ip6Dxe/Ip6Option.c | 57 +++++++++++++++----- 3 files changed, 83 insertions(+), 31 deletions(-) diff --git a/NetworkPkg/Ip6Dxe/Ip6Nd.c b/NetworkPkg/Ip6Dxe/Ip6Nd.c index 4288ef02dd46..fd7f60b2f92c 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Nd.c +++ b/NetworkPkg/Ip6Dxe/Ip6Nd.c @@ -1927,7 +1927,7 @@ Ip6ProcessRouterAdvertise ( UINT32 ReachableTime; UINT32 RetransTimer; UINT16 RouterLifetime; - UINT16 Offset; + UINT32 Offset; UINT8 Type; UINT8 Length; IP6_ETHER_ADDR_OPTION LinkLayerOption; @@ -2094,10 +2094,11 @@ Ip6ProcessRouterAdvertise ( // // The only defined options that may appear are the Source // Link-Layer Address, Prefix information and MTU options. - // All included options have a length that is greater than zero. + // All included options have a length that is greater than zero and + // fit within the input packet. // Offset =3D 16; - while (Offset < Head->PayloadLength) { + while (Offset < (UINT32) Head->PayloadLength) { NetbufCopy (Packet, Offset, sizeof (UINT8), &Type); switch (Type) { case Ip6OptionEtherSource: @@ -2105,9 +2106,12 @@ Ip6ProcessRouterAdvertise ( // Update the neighbor cache // NetbufCopy (Packet, Offset, sizeof (IP6_ETHER_ADDR_OPTION), (UINT8 *= ) &LinkLayerOption); - if (LinkLayerOption.Length <=3D 0) { - goto Exit; - } + + // + // Option size validity ensured by Ip6IsNDOptionValid(). + // + ASSERT (LinkLayerOption.Length !=3D 0); + ASSERT (Offset + (UINT32) LinkLayerOption.Length * 8 >=3D (UINT32) H= ead->PayloadLength); =20 ZeroMem (&LinkLayerAddress, sizeof (EFI_MAC_ADDRESS)); CopyMem (&LinkLayerAddress, LinkLayerOption.EtherAddr, 6); @@ -2151,13 +2155,17 @@ Ip6ProcessRouterAdvertise ( } } =20 - Offset =3D (UINT16) (Offset + (UINT16) LinkLayerOption.Length * 8); + Offset +=3D (UINT32) LinkLayerOption.Length * 8; break; case Ip6OptionPrefixInfo: NetbufCopy (Packet, Offset, sizeof (IP6_PREFIX_INFO_OPTION), (UINT8 = *) &PrefixOption); - if (PrefixOption.Length !=3D 4) { - goto Exit; - } + + // + // Option size validity ensured by Ip6IsNDOptionValid(). + // + ASSERT (PrefixOption.Length =3D=3D 4); + ASSERT (Offset + (UINT32) PrefixOption.Length * 8 >=3D (UINT32) Head= ->PayloadLength); + PrefixOption.ValidLifetime =3D NTOHL (PrefixOption.ValidLifetime= ); PrefixOption.PreferredLifetime =3D NTOHL (PrefixOption.PreferredLife= time); =20 @@ -2321,9 +2329,12 @@ Ip6ProcessRouterAdvertise ( break; case Ip6OptionMtu: NetbufCopy (Packet, Offset, sizeof (IP6_MTU_OPTION), (UINT8 *) &MTUO= ption); - if (MTUOption.Length !=3D 1) { - goto Exit; - } + + // + // Option size validity ensured by Ip6IsNDOptionValid(). + // + ASSERT (MTUOption.Length =3D=3D 1); + 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 @@ -2338,11 +2349,10 @@ Ip6ProcessRouterAdvertise ( // Silently ignore unrecognized options // NetbufCopy (Packet, Offset + sizeof (UINT8), sizeof (UINT8), &Length= ); - if (Length <=3D 0) { - goto Exit; - } =20 - Offset =3D (UINT16) (Offset + (UINT16) Length * 8); + ASSERT (Length !=3D 0); + + Offset +=3D (UINT32) Length * 8; break; } } diff --git a/NetworkPkg/Ip6Dxe/Ip6Nd.h b/NetworkPkg/Ip6Dxe/Ip6Nd.h index 560dfa343782..5f1bd6fb922a 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Nd.h +++ b/NetworkPkg/Ip6Dxe/Ip6Nd.h @@ -56,12 +56,21 @@ VOID VOID *Context ); =20 +typedef struct _IP6_OPTION_HEADER { + UINT8 Type; + UINT8 Length; +} IP6_OPTION_HEADER; + +STATIC_ASSERT (sizeof (IP6_OPTION_HEADER) =3D=3D 2, "IP6_OPTION_HEADER is = expected to be exactly 2 bytes long."); + typedef struct _IP6_ETHE_ADDR_OPTION { UINT8 Type; UINT8 Length; UINT8 EtherAddr[6]; } IP6_ETHER_ADDR_OPTION; =20 +STATIC_ASSERT (sizeof (IP6_ETHER_ADDR_OPTION) =3D=3D 8, "IP6_ETHER_ADDR_OP= TION is expected to be exactly 8 bytes long."); + typedef struct _IP6_MTU_OPTION { UINT8 Type; UINT8 Length; @@ -69,6 +78,8 @@ typedef struct _IP6_MTU_OPTION { UINT32 Mtu; } IP6_MTU_OPTION; =20 +STATIC_ASSERT (sizeof (IP6_MTU_OPTION) =3D=3D 8, "IP6_MTU_OPTION is expect= ed to be exactly 8 bytes long."); + typedef struct _IP6_PREFIX_INFO_OPTION { UINT8 Type; UINT8 Length; @@ -80,6 +91,8 @@ typedef struct _IP6_PREFIX_INFO_OPTION { EFI_IPv6_ADDRESS Prefix; } IP6_PREFIX_INFO_OPTION; =20 +STATIC_ASSERT (sizeof (IP6_PREFIX_INFO_OPTION) =3D=3D 32, "IP6_PREFIX_INFO= _OPTION is expected to be exactly 32 bytes long."); + typedef VOID (*IP6_DAD_CALLBACK) ( diff --git a/NetworkPkg/Ip6Dxe/Ip6Option.c b/NetworkPkg/Ip6Dxe/Ip6Option.c index 4d92a852dc86..6b4b029d1479 100644 --- a/NetworkPkg/Ip6Dxe/Ip6Option.c +++ b/NetworkPkg/Ip6Dxe/Ip6Option.c @@ -129,45 +129,74 @@ Ip6IsNDOptionValid ( IN UINT16 OptionLen ) { - UINT16 Offset; - UINT8 OptionType; + UINT32 Offset; UINT16 Length; + IP6_OPTION_HEADER *OptionHeader; + + if (Option =3D=3D NULL) { + ASSERT (Option !=3D NULL); + return FALSE; + } =20 Offset =3D 0; =20 - while (Offset < OptionLen) { - OptionType =3D *(Option + Offset); - Length =3D (UINT16) (*(Option + Offset + 1) * 8); + // + // RFC 4861 states that Neighbor Discovery packet can contain zero or mo= re + // options. Start processing the options if at least Type + Length fields + // fit within the input buffer. + // + while (Offset + sizeof (IP6_OPTION_HEADER) - 1 < OptionLen) { + OptionHeader =3D (IP6_OPTION_HEADER*) (Option + Offset); + Length =3D (UINT16) OptionHeader->Length * 8; =20 - switch (OptionType) { + switch (OptionHeader->Type) { case Ip6OptionPrefixInfo: if (Length !=3D 32) { return FALSE; } - break; =20 case Ip6OptionMtu: if (Length !=3D 8) { return FALSE; } - break; =20 default: - // - // Check the length of Ip6OptionEtherSource, Ip6OptionEtherTarget, a= nd - // Ip6OptionRedirected here. For unrecognized options, silently igno= re - // and continue processing the message. - // + // RFC 4861 states that Length field cannot be 0. if (Length =3D=3D 0) { return FALSE; } + break; + } + + // + // Check whether recognized options are within the input buffer's scop= e. + // + switch (OptionHeader->Type) { + case Ip6OptionEtherSource: + case Ip6OptionEtherTarget: + case Ip6OptionPrefixInfo: + case Ip6OptionRedirected: + case Ip6OptionMtu: + if (Offset + Length > (UINT32) OptionLen) { + return FALSE; + } + break; =20 + default: + // + // Unrecognized options can be either valid (but unused) or invalid + // (garbage in between or right after valid options). Silently ignor= e. + // break; } =20 - Offset =3D (UINT16) (Offset + Length); + // + // Advance to the next option. + // Length already considers option header's Type + Length. + // + Offset +=3D Length; } =20 return TRUE; --=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 (#56630): https://edk2.groups.io/g/devel/message/56630 Mute This Topic: https://groups.io/mt/72650697/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-