From 1ab1024f94401300fe9a1d5cdce6c15a2b091e02 Mon Sep 17 00:00:00 2001

From: Laszlo Ersek <lersek@redhat.com>

Date: Mon, 2 Dec 2019 12:31:50 +0100

Subject: [PATCH 4/9] CryptoPkg/Crt: satisfy "inet_pton.c" dependencies

 (CVE-2019-14553)

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Laszlo Ersek <lersek@redhat.com>

Message-id: <20191117220052.15700-5-lersek@redhat.com>

Patchwork-id: 92453

O-Subject: [RHEL-8.2.0 edk2 PATCH 4/9] CryptoPkg/Crt: satisfy "inet_pton.c" dependencies (CVE-2019-14553)

Bugzilla: 1536624

RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>

RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>

In a later patch in this series, we're going to resurrect "inet_pton.c"

(originally from the StdLib package). That source file has a number of

standard C and BSD socket dependencies. Provide those dependencies here:

- The header files below will simply #include <CrtLibSupport.h>:

  - arpa/inet.h

  - arpa/nameser.h

  - netinet/in.h

  - sys/param.h

  - sys/socket.h

- EAFNOSUPPORT comes from "StdLib/Include/errno.h", at commit

  e2d3a25f1a31; which is the commit immediately preceding the removal of

  StdLib from edk2 (964f432b9b0a).

  Note that the other error macro, which we alread #define, namely EINVAL,

  has a value (22) that also matches "StdLib/Include/errno.h".

- The AF_INET and AF_INET6 address family macros come from

  "StdLib/Include/sys/socket.h".

- The NS_INT16SZ, NS_INADDRSZ and NS_IN6ADDRSZ macros come from

  "StdLib/Include/arpa/nameser.h".

- The "u_int" and "u_char" types come from "StdLib/Include/sys/types.h".

Cc: David Woodhouse <dwmw2@infradead.org>

Cc: Jian J Wang <jian.j.wang@intel.com>

Cc: Jiaxin Wu <jiaxin.wu@intel.com>

Cc: Sivaraman Nainar <sivaramann@amiindia.co.in>

Cc: Xiaoyu Lu <xiaoyux.lu@intel.com>

Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=960

CVE: CVE-2019-14553

Signed-off-by: Laszlo Ersek <lersek@redhat.com>

Reviewed-by: Jian J Wang <jian.j.wang@intel.com>

Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>

(cherry picked from commit 2ac41c12c0d4b3d3ee8f905ab80da019e784de00)

---

 CryptoPkg/Library/Include/CrtLibSupport.h | 16 ++++++++++++++++

 CryptoPkg/Library/Include/arpa/inet.h     |  9 +++++++++

 CryptoPkg/Library/Include/arpa/nameser.h  |  9 +++++++++

 CryptoPkg/Library/Include/netinet/in.h    |  9 +++++++++

 CryptoPkg/Library/Include/sys/param.h     |  9 +++++++++

 CryptoPkg/Library/Include/sys/socket.h    |  9 +++++++++

 6 files changed, 61 insertions(+)

 create mode 100644 CryptoPkg/Library/Include/arpa/inet.h

 create mode 100644 CryptoPkg/Library/Include/arpa/nameser.h

 create mode 100644 CryptoPkg/Library/Include/netinet/in.h

 create mode 100644 CryptoPkg/Library/Include/sys/param.h

 create mode 100644 CryptoPkg/Library/Include/sys/socket.h

diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h

index b90da20..e603fad 100644

--- a/CryptoPkg/Library/Include/CrtLibSupport.h

+++ b/CryptoPkg/Library/Include/CrtLibSupport.h

@@ -74,6 +74,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent

 // Definitions for global constants used by CRT library routines

 //

 #define EINVAL       22               /* Invalid argument */

+#define EAFNOSUPPORT 47               /* Address family not supported by protocol family */

 #define INT_MAX      0x7FFFFFFF       /* Maximum (signed) int value */

 #define LONG_MAX     0X7FFFFFFFL      /* max value for a long */

 #define LONG_MIN     (-LONG_MAX-1)    /* min value for a long */

@@ -81,13 +82,28 @@ SPDX-License-Identifier: BSD-2-Clause-Patent

 #define CHAR_BIT     8                /* Number of bits in a char */

 //

+// Address families.

+//

+#define AF_INET   2     /* internetwork: UDP, TCP, etc. */

+#define AF_INET6  24    /* IP version 6 */

+

+//

+// Define constants based on RFC0883, RFC1034, RFC 1035

+//

+#define NS_INT16SZ    2   /*%< #/bytes of data in a u_int16_t */

+#define NS_INADDRSZ   4   /*%< IPv4 T_A */

+#define NS_IN6ADDRSZ  16  /*%< IPv6 T_AAAA */

+

+//

 // Basic types mapping

 //

 typedef UINTN          size_t;

+typedef UINTN          u_int;

 typedef INTN           ssize_t;

 typedef INT32          time_t;

 typedef UINT8          __uint8_t;

 typedef UINT8          sa_family_t;

+typedef UINT8          u_char;

 typedef UINT32         uid_t;

 typedef UINT32         gid_t;

diff --git a/CryptoPkg/Library/Include/arpa/inet.h b/CryptoPkg/Library/Include/arpa/inet.h

new file mode 100644

index 0000000..988e4e0

--- /dev/null

+++ b/CryptoPkg/Library/Include/arpa/inet.h

@@ -0,0 +1,9 @@

+/** @file

+  Include file to support building third-party standard C / BSD sockets code.

+

+  Copyright (C) 2019, Red Hat, Inc.

+

+  SPDX-License-Identifier: BSD-2-Clause-Patent

+**/

+

+#include <CrtLibSupport.h>

diff --git a/CryptoPkg/Library/Include/arpa/nameser.h b/CryptoPkg/Library/Include/arpa/nameser.h

new file mode 100644

index 0000000..988e4e0

--- /dev/null

+++ b/CryptoPkg/Library/Include/arpa/nameser.h

@@ -0,0 +1,9 @@

+/** @file

+  Include file to support building third-party standard C / BSD sockets code.

+

+  Copyright (C) 2019, Red Hat, Inc.

+

+  SPDX-License-Identifier: BSD-2-Clause-Patent

+**/

+

+#include <CrtLibSupport.h>

diff --git a/CryptoPkg/Library/Include/netinet/in.h b/CryptoPkg/Library/Include/netinet/in.h

new file mode 100644

index 0000000..988e4e0

--- /dev/null

+++ b/CryptoPkg/Library/Include/netinet/in.h

@@ -0,0 +1,9 @@

+/** @file

+  Include file to support building third-party standard C / BSD sockets code.

+

+  Copyright (C) 2019, Red Hat, Inc.

+

+  SPDX-License-Identifier: BSD-2-Clause-Patent

+**/

+

+#include <CrtLibSupport.h>

diff --git a/CryptoPkg/Library/Include/sys/param.h b/CryptoPkg/Library/Include/sys/param.h

new file mode 100644

index 0000000..988e4e0

--- /dev/null

+++ b/CryptoPkg/Library/Include/sys/param.h

@@ -0,0 +1,9 @@

+/** @file

+  Include file to support building third-party standard C / BSD sockets code.

+

+  Copyright (C) 2019, Red Hat, Inc.

+

+  SPDX-License-Identifier: BSD-2-Clause-Patent

+**/

+

+#include <CrtLibSupport.h>

diff --git a/CryptoPkg/Library/Include/sys/socket.h b/CryptoPkg/Library/Include/sys/socket.h

new file mode 100644

index 0000000..988e4e0

--- /dev/null

+++ b/CryptoPkg/Library/Include/sys/socket.h

@@ -0,0 +1,9 @@

+/** @file

+  Include file to support building third-party standard C / BSD sockets code.

+

+  Copyright (C) 2019, Red Hat, Inc.

+

+  SPDX-License-Identifier: BSD-2-Clause-Patent

+**/

+

+#include <CrtLibSupport.h>

-- 

1.8.3.1