From efd11134bb9bfa33f3c64aee634b2232bee571d3 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Thu, 14 Sep 2023 14:25:04 +0800
Subject: Glibc: Fix CVE-2023-4806

---
 chapter08/glibc.xml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

(limited to 'chapter08/glibc.xml')

diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index c648fe129..f48d95d09 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -50,22 +50,10 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
 
-    <para>Now fix a regression causing the posix_memalign() function 
-    to be very slow in some conditions:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&glibc-memalign-patch;</userinput></screen>
-
-    <!-- CVE-2023-4527
-         https://sourceware.org/bugzilla/show_bug.cgi?id=30842
-         https://sourceware.org/ml/libc-alpha/2023-September/151522.html -->
-    <para>Then fix a security vulnerability exploitable when the
-    <option>no-aaaa</option> option is used in
-    <filename>/etc/resolv.conf</filename>:</para>
-
-<screen><userinput remap="pre">sed \
-  -E "/__res_context_search/\
-      {N;N;s/(search \(([^,]*,){6}[^,]*)NULL/\1\&amp;alt_dns_packet_buffer/}" \
-  -i resolv/nss_dns/dns-host.c</userinput></screen>
+    <para>Now fix two security vulnerabilities and a regression causing the
+    posix_memalign() function very slow in some conditions:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-fixes-patch;</userinput></screen>
 
     <para>The Glibc documentation recommends building Glibc
     in a dedicated build directory:</para>
-- 
cgit v1.2.3-54-g00ecf