diff -Nru glibc-2.36/debian/changelog glibc-2.36/debian/changelog
--- glibc-2.36/debian/changelog	2022-10-07 11:13:35.000000000 +0300
+++ glibc-2.36/debian/changelog	2023-03-13 13:58:04.000000000 +0200
@@ -1,3 +1,9 @@
+glibc (2.36-0ubuntu4.1) kinetic; urgency=medium
+
+  * d/p/0001-x86-Check-minimum-maximum-of-non_temporal_threshold-.patch (LP: #2011421) 
+
+ -- Ioanna Alifieraki <ioanna-maria.alifieraki@canonical.com>  Mon, 13 Mar 2023 13:58:04 +0200
+
 glibc (2.36-0ubuntu4) kinetic; urgency=medium
 
   [ Michael Hudson-Doyle ]
diff -Nru glibc-2.36/debian/patches/0001-x86-Check-minimum-maximum-of-non_temporal_threshold-.patch glibc-2.36/debian/patches/0001-x86-Check-minimum-maximum-of-non_temporal_threshold-.patch
--- glibc-2.36/debian/patches/0001-x86-Check-minimum-maximum-of-non_temporal_threshold-.patch	1970-01-01 02:00:00.000000000 +0200
+++ glibc-2.36/debian/patches/0001-x86-Check-minimum-maximum-of-non_temporal_threshold-.patch	2023-03-13 13:57:51.000000000 +0200
@@ -0,0 +1,68 @@
+From c1386dbf5c8cdb7a9cdf345e51793f168959bb59 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Origin: upstream, https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=48b74865c63840b288bd85b4d8743533b73b339b
+Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29953
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/2011421
+Date: Tue, 3 Jan 2023 13:06:48 -0800
+Subject: [PATCH 2/2] x86: Check minimum/maximum of non_temporal_threshold [BZ
+ #29953]
+
+The minimum non_temporal_threshold is 0x4040.  non_temporal_threshold may
+be set to less than the minimum value when the shared cache size isn't
+available (e.g., in an emulator) or by the tunable.  Add checks for
+minimum and maximum of non_temporal_threshold.
+
+This fixes BZ #29953.
+---
+ sysdeps/x86/dl-cacheinfo.h | 25 ++++++++++++++++---------
+ 1 file changed, 16 insertions(+), 9 deletions(-)
+
+--- a/sysdeps/x86/dl-cacheinfo.h
++++ b/sysdeps/x86/dl-cacheinfo.h
+@@ -861,6 +861,18 @@ dl_init_cacheinfo (struct cpu_features *
+      share of the cache, it has a substantial risk of negatively
+      impacting the performance of other threads running on the chip. */
+   unsigned long int non_temporal_threshold = shared * 3 / 4;
++  /* SIZE_MAX >> 4 because memmove-vec-unaligned-erms right-shifts the value of
++     'x86_non_temporal_threshold' by `LOG_4X_MEMCPY_THRESH` (4) and it is best
++     if that operation cannot overflow. Minimum of 0x4040 (16448) because the
++     L(large_memset_4x) loops need 64-byte to cache align and enough space for
++     at least 1 iteration of 4x PAGE_SIZE unrolled loop.  Both values are
++     reflected in the manual.  */
++  unsigned long int maximum_non_temporal_threshold = SIZE_MAX >> 4;
++  unsigned long int minimum_non_temporal_threshold = 0x4040;
++  if (non_temporal_threshold < minimum_non_temporal_threshold)
++    non_temporal_threshold = minimum_non_temporal_threshold;
++  else if (non_temporal_threshold > maximum_non_temporal_threshold)
++    non_temporal_threshold = maximum_non_temporal_threshold;
+ 
+ #if HAVE_TUNABLES
+   /* NB: The REP MOVSB threshold must be greater than VEC_SIZE * 8.  */
+@@ -915,8 +927,8 @@ dl_init_cacheinfo (struct cpu_features *
+     shared = tunable_size;
+ 
+   tunable_size = TUNABLE_GET (x86_non_temporal_threshold, long int, NULL);
+-  /* NB: Ignore the default value 0.  */
+-  if (tunable_size != 0)
++  if (tunable_size > minimum_non_temporal_threshold
++      && tunable_size <= maximum_non_temporal_threshold)
+     non_temporal_threshold = tunable_size;
+ 
+   tunable_size = TUNABLE_GET (x86_rep_movsb_threshold, long int, NULL);
+@@ -931,14 +943,9 @@ dl_init_cacheinfo (struct cpu_features *
+ 
+   TUNABLE_SET_WITH_BOUNDS (x86_data_cache_size, data, 0, SIZE_MAX);
+   TUNABLE_SET_WITH_BOUNDS (x86_shared_cache_size, shared, 0, SIZE_MAX);
+-  /* SIZE_MAX >> 4 because memmove-vec-unaligned-erms right-shifts the value of
+-     'x86_non_temporal_threshold' by `LOG_4X_MEMCPY_THRESH` (4) and it is best
+-     if that operation cannot overflow. Minimum of 0x4040 (16448) because the
+-     L(large_memset_4x) loops need 64-byte to cache align and enough space for
+-     at least 1 iteration of 4x PAGE_SIZE unrolled loop.  Both values are
+-     reflected in the manual.  */
+   TUNABLE_SET_WITH_BOUNDS (x86_non_temporal_threshold, non_temporal_threshold,
+-			   0x4040, SIZE_MAX >> 4);
++			   minimum_non_temporal_threshold,
++			   maximum_non_temporal_threshold);
+   TUNABLE_SET_WITH_BOUNDS (x86_rep_movsb_threshold, rep_movsb_threshold,
+ 			   minimum_rep_movsb_threshold, SIZE_MAX);
+   TUNABLE_SET_WITH_BOUNDS (x86_rep_stosb_threshold, rep_stosb_threshold, 1,
diff -Nru glibc-2.36/debian/patches/series glibc-2.36/debian/patches/series
--- glibc-2.36/debian/patches/series	2022-10-06 10:20:18.000000000 +0300
+++ glibc-2.36/debian/patches/series	2023-03-13 13:57:45.000000000 +0200
@@ -230,3 +230,4 @@
 0001-Avoid-undefined-behaviour-in-ibm128-implementation-o.patch
 0001-Fix-BZ-29463-in-the-ibm128-implementation-of-y1l-too.patch
 restore-libc-DT_HASH.patch
+0001-x86-Check-minimum-maximum-of-non_temporal_threshold-.patch