diff options
author | Laszlo Ersek <lersek@redhat.com> | 2019-10-24 15:20:18 +0200 |
---|---|---|
committer | Laszlo Ersek <lersek@redhat.com> | 2019-11-02 12:07:59 +0100 |
commit | 8d16ef8269b2ff373d8da674e59992adfdc032d3 (patch) | |
tree | 914b73c06386fc49c18916d9ab8b65e5cab5fb54 /CryptoPkg/Library/Include | |
parent | 2ac41c12c0d4b3d3ee8f905ab80da019e784de00 (diff) | |
download | edk2-8d16ef8269b2ff373d8da674e59992adfdc032d3.tar.gz edk2-8d16ef8269b2ff373d8da674e59992adfdc032d3.tar.bz2 edk2-8d16ef8269b2ff373d8da674e59992adfdc032d3.zip |
CryptoPkg/Crt: import "inet_pton.c" (CVE-2019-14553)
For TianoCore BZ#1734, StdLib has been moved from the edk2 project to the
edk2-libc project, in commit 964f432b9b0a ("edk2: Remove AppPkg, StdLib,
StdLibPrivateInternalFiles", 2019-04-29).
We'd like to use the inet_pton() function in CryptoPkg. Resurrect the
"inet_pton.c" file from just before the StdLib removal, as follows:
$ git show \
964f432b9b0a^:StdLib/BsdSocketLib/inet_pton.c \
> CryptoPkg/Library/BaseCryptLib/SysCall/inet_pton.c
The inet_pton() function is only intended for the DXE phase at this time,
therefore only the "BaseCryptLib" instance INF file receives the new file.
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>
Diffstat (limited to 'CryptoPkg/Library/Include')
-rw-r--r-- | CryptoPkg/Library/Include/CrtLibSupport.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h index e603fad763..5a20ba636f 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -192,6 +192,7 @@ void abort (void) __attribute__((__noreturn__)); #else
void abort (void);
#endif
+int inet_pton (int, const char *, void *);
//
// Macros that directly map functions to BaseLib, BaseMemoryLib, and DebugLib functions
|