From e1031b69c3029699d0b4c8409b311b2e4aa853d0 Mon Sep 17 00:00:00 2001
From: Thomas Kuschel <thomas@kuschel.at>
Date: Sat, 24 May 2025 21:18:01 +0200
Subject: [PATCH] CHG Linux 6.14.7-2m ARCH_MMAP_RND_BITS from 32 to 28,
 ARCH_MMAP_RND_COMPAT_BITS from 16 to 8

---
 PKGBUILD                                             |  4 +---
 config                                               | 12 ++++++------
 documentation/linux_configuration.pdf                |  4 ++--
 ...ion_09_general_architecture-dependent_options.tex |  4 ++--
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index f29a6c1..1ddd93e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # copied from Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgbase=linux-tom
-pkgver=6.14.7.arch1
+pkgver=6.14.7.arch2
 pkgrel=1
 pkgdesc='Linux'
 url='https://github.com/archlinux/linux'
@@ -284,5 +284,3 @@ for _p in "${pkgname[@]}"; do
     _package${_p#$pkgbase}
   }"
 done
-
-# vim:set ts=8 sts=2 sw=2 et:
diff --git a/config b/config
index 96182eb..fbf6599 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.14.6-arch1 Kernel Configuration
+# Linux/x86 6.14.7-arch2 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 15.1.1 20250425"
 CONFIG_CC_IS_GCC=y
@@ -11,7 +11,7 @@ CONFIG_AS_VERSION=24400
 CONFIG_LD_IS_BFD=y
 CONFIG_LD_VERSION=24400
 CONFIG_LLD_VERSION=0
-CONFIG_RUSTC_VERSION=108600
+CONFIG_RUSTC_VERSION=108700
 CONFIG_RUST_IS_AVAILABLE=y
 CONFIG_RUSTC_LLVM_VERSION=190107
 CONFIG_CC_CAN_LINK=y
@@ -258,7 +258,6 @@ CONFIG_UTS_NS=y
 CONFIG_TIME_NS=y
 CONFIG_IPC_NS=y
 CONFIG_USER_NS=y
-CONFIG_USER_NS_UNPRIVILEGED=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_CHECKPOINT_RESTORE=y
@@ -328,7 +327,7 @@ CONFIG_PERF_EVENTS=y
 CONFIG_SYSTEM_DATA_VERIFICATION=y
 CONFIG_PROFILING=y
 CONFIG_RUST=y
-CONFIG_RUSTC_VERSION_TEXT="rustc 1.86.0 (05f9846f8 2025-03-31) (Arch Linux rust 1:1.86.0-1)"
+CONFIG_RUSTC_VERSION_TEXT="rustc 1.87.0 (17067e9ac 2025-05-09) (Arch Linux rust 1:1.87.0-1)"
 CONFIG_BINDGEN_VERSION_TEXT="bindgen 0.71.1"
 CONFIG_TRACEPOINTS=y
 
@@ -598,6 +597,7 @@ CONFIG_MITIGATION_SPECTRE_V1=y
 CONFIG_MITIGATION_SPECTRE_V2=y
 CONFIG_MITIGATION_SRBDS=y
 CONFIG_MITIGATION_SSB=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_ARCH_HAS_ADD_PAGES=y
 
 #
@@ -941,9 +941,9 @@ CONFIG_SOFTIRQ_ON_OWN_STACK=y
 CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
-CONFIG_ARCH_MMAP_RND_BITS=32
+CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=16
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
 CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
 CONFIG_HAVE_PAGE_SIZE_4KB=y
 CONFIG_PAGE_SIZE_4KB=y
diff --git a/documentation/linux_configuration.pdf b/documentation/linux_configuration.pdf
index cbb1f09..ec4b96c 100644
--- a/documentation/linux_configuration.pdf
+++ b/documentation/linux_configuration.pdf
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59514a4e53bd072472bcecce7bc23cf6a8ed1c96dd50519afe8920e0703e12df
-size 3510466
+oid sha256:7b06b9841c1ea11a666857e39325ec7e6921f64f02d794799fabffedff842af8
+size 3510447
diff --git a/documentation/linux_configuration_09_general_architecture-dependent_options.tex b/documentation/linux_configuration_09_general_architecture-dependent_options.tex
index 0d58aeb..e945890 100644
--- a/documentation/linux_configuration_09_general_architecture-dependent_options.tex
+++ b/documentation/linux_configuration_09_general_architecture-dependent_options.tex
@@ -135,7 +135,7 @@ Erstellen Sie den Kernel normal, ohne Link Time Optimization (LTO).
 \english{Build the kernel normally, without Link Time Optimization (LTO).}
 
 \subsection{Number of bits to use for ASLR of mmap base address}
-CONFIG\_ARCH\_MMAP\_RND\_BITS [=32] \textbf{[32]}\\*
+CONFIG\_ARCH\_MMAP\_RND\_BITS [=28] \textbf{[28]}\\*
 Dieser Wert kann verwendet werden, um die Anzahl der Bits auszuwählen, die zur Bestimmung des zufälligen Offsets zur Basisadresse
 von vma-Regionen verwendet werden, die aus mmap-Zuweisungen resultieren.
 Dieser Wert wird durch die von der Architektur unterstützten Mindest- und Höchstwerte begrenzt.
@@ -146,7 +146,7 @@ This value will be bounded by the architecture's minimum and maximum supported v
 This value can be changed after boot using the /proc/sys/vm/mmap\_rnd\_bits tunable}
 
 \subsection{Number of bits to use for ASLR of mmap base address for compatible applications}
-CONFIG\_ARCH\_MMAP\_RND\_CAMPAT\_BITS [=16] \textbf{[16]}\\*
+CONFIG\_ARCH\_MMAP\_RND\_CAMPAT\_BITS [=8] \textbf{[8]}\\*
 Dieser Wert kann verwendet werden, um die Anzahl der Bits auszuwählen, die zur Bestimmung des zufälligen Offsets zur Basisadresse
 von vma-Regionen verwendet werden, die aus mmap-Zuweisungen resultieren.
 Dieser Wert wird durch die von der Architektur unterstützten Mindest- und Höchstwerte begrenzt.