From: Florian Weimer <fweimer@redhat.com>
Date: Tue, 6 Feb 2018 08:19:03 +0000 (+0100)
Subject: Record CVE-2018-6551 in NEWS and ChangeLog [BZ #22774]
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=017d97cd2ec0f626f8afb8c73ea3d612d8e844c3;p=thirdparty%2Fglibc.git

Record CVE-2018-6551 in NEWS and ChangeLog [BZ #22774]

(cherry picked from commit 71aa429b029fdb6f9e65d44050388b51eca460d6)
---

diff --git a/ChangeLog b/ChangeLog
index e92c1106024..0b838029c05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2018-01-18  Arjun Shankar  <arjun@redhat.com>
 
 	[BZ #22343]
+	[BZ #22774]
 	CVE-2018-6485
+	CVE-2018-6551
 	* malloc/malloc.c (checked_request2size): call REQUEST_OUT_OF_RANGE
 	after padding.
 	(_int_memalign): check for integer overflow before calling
diff --git a/NEWS b/NEWS
index ac8901e05da..db81e9e6b14 100644
--- a/NEWS
+++ b/NEWS
@@ -91,6 +91,10 @@ Version 2.22.1
 * CVE-2018-6485: The posix_memalign and memalign functions, when called with
   an object size near the value of SIZE_MAX, would return a pointer to a
   buffer which is too small, instead of NULL.  Reported by Jakub Wilk.
+
+* CVE-2018-6551: The malloc function, when called with an object size near
+  the value of SIZE_MAX, would return a pointer to a buffer which is too
+  small, instead of NULL.
 
 Version 2.22