sravan/linux-tkg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5.15.27 hardened bump (#455)

Browse Source
This commit is contained in:
amelia
2022-03-10 17:06:26 +00:00
committed by GitHub
parent a1d2d60beb
commit 6facf761d6
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKGBUILD
View File

@@ -640,7 +640,7 @@ case $_basever in
'ab323e0994a6bf1e8116a0e26c8e64edba87c7d85ec99f00380fdc11168dcda4' 'ab323e0994a6bf1e8116a0e26c8e64edba87c7d85ec99f00380fdc11168dcda4'
'SKIP' 'SKIP'
'24be2e8863e265195a24d7082804cd4328fd9f0a31b88672c884b9fd42469ed8' '24be2e8863e265195a24d7082804cd4328fd9f0a31b88672c884b9fd42469ed8'
'e885f7b2c68d6d7ec9050a692aa044fecab3c1dda6908175a6d4e13bf8507ceb' '6e3ef6bc4779ae3b7154642147d5ab3ece6e38e3e08bdb30f86d89d2b4855fa9'
'1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898' '1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
'66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997' '66a03c246037451a77b4d448565b1d7e9368270c7d02872fbd0b5d024ed0a997'
'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6' 'f6383abef027fd9a430fd33415355e0df492cdc3c90e9938bf2d98f4f63b32e6'
@@ -658,7 +658,7 @@ case $_basever in
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'978b197efa56781a1d5651a3649c3d8b926d55748b4b9063788dfe1a861fc1bc' '978b197efa56781a1d5651a3649c3d8b926d55748b4b9063788dfe1a861fc1bc'
'd11edf802031e9335e4236ea1bb56d7fff9f6159dbc5f0afe407256b95d601fc' 'd11edf802031e9335e4236ea1bb56d7fff9f6159dbc5f0afe407256b95d601fc'
'b5e0f50ef64c25069987cf4c4ec3501ed5288bc43106c52e3aefddaa7a649c39' '4499b55ed1c0b9527feba77160f6f244c93dfed417d04e0ba88a077a8140b281'
'434e4707efc1bc3919597c87d44fa537f7563ae04236479bbf1adb5f410ab69d' '434e4707efc1bc3919597c87d44fa537f7563ae04236479bbf1adb5f410ab69d'
'1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313' '1b656ad96004f27e9dc63d7f430b50d5c48510d6d4cd595a81c24b21adb70313'
'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6') 'b0319a7dff9c48b2f3e3d3597ee154bf92223149a633a8b7ce4026252db86da6')

3
linux-tkg-config/5.15/config_hardened.x86_64
View File

@@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 5.15.25-hardened1 Kernel Configuration # Linux/x86 5.15.27-hardened1 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@@ -10479,4 +10479,3 @@ CONFIG_ARCH_USE_MEMTEST=y
# CONFIG_HYPERV_TESTING is not set # CONFIG_HYPERV_TESTING is not set
# end of Kernel Testing and Coverage # end of Kernel Testing and Coverage
# end of Kernel hacking # end of Kernel hacking

16
linux-tkg-patches/5.15/0012-linux-hardened.patch
View File

@@ -102,13 +102,13 @@ index d91ab28718d4..4ead5cd52644 100644
If set, provide RFC2861 behavior and time out the congestion If set, provide RFC2861 behavior and time out the congestion
window after an idle period. An idle period is defined at window after an idle period. An idle period is defined at
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index c50d4ec83be8..a88b0b67c745 100644 index 6a422b34582a..181a51b59f0e 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
VERSION = 5 VERSION = 5
PATCHLEVEL = 15 PATCHLEVEL = 15
SUBLEVEL = 25 SUBLEVEL = 27
-EXTRAVERSION = -EXTRAVERSION =
+EXTRAVERSION = -hardened1 +EXTRAVERSION = -hardened1
NAME = Trick or Treat NAME = Trick or Treat
@@ -1232,10 +1232,10 @@ index 33a4240e6a6f..82213f9c4c17 100644
{ {
return &init_user_ns; return &init_user_ns;
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 671d402c3778..fe94d6a8da3f 100644 index 4fe9e885bbfa..fdc9ab7b4993 100644
--- a/include/linux/vmalloc.h --- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h
@@ -136,18 +136,18 @@ static inline void vmalloc_init(void) @@ -143,18 +143,18 @@ static inline void vmalloc_init(void)
static inline unsigned long vmalloc_nr_pages(void) { return 0; } static inline unsigned long vmalloc_nr_pages(void) { return 0; }
#endif #endif
@@ -1497,7 +1497,7 @@ index b81652fc2cdd..fce3ec1a1e1b 100644
return err; return err;
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index 28aee1a8875b..475372883e06 100644 index 89475c994ca9..cbc13a0b7e57 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -82,6 +82,7 @@ @@ -82,6 +82,7 @@
@@ -1519,7 +1519,7 @@ index 28aee1a8875b..475372883e06 100644
/* /*
* Thread groups must share signals as well, and detached threads * Thread groups must share signals as well, and detached threads
* can only be started up within the thread group. * can only be started up within the thread group.
@@ -3055,6 +3060,12 @@ int ksys_unshare(unsigned long unshare_flags) @@ -3066,6 +3071,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS) if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS; unshare_flags |= CLONE_FS;
@@ -1848,7 +1848,7 @@ index 85f1021ad459..d14f7857c31d 100644
struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]); struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index 6b2e3ca7ee99..0253002184f1 100644 index 5481ba44a8d6..423ab2563ad7 100644
--- a/kernel/user_namespace.c --- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c +++ b/kernel/user_namespace.c
@@ -21,6 +21,13 @@ @@ -21,6 +21,13 @@
@@ -2695,7 +2695,7 @@ index af3cad4e5378..f7bca4651ed5 100644
void __put_page(struct page *page) void __put_page(struct page *page)
diff --git a/mm/util.c b/mm/util.c diff --git a/mm/util.c b/mm/util.c
index bacabe446906..a3bcc8aef4b4 100644 index ea09dd33ab59..523194016e8e 100644
--- a/mm/util.c --- a/mm/util.c
+++ b/mm/util.c +++ b/mm/util.c
@@ -348,9 +348,9 @@ unsigned long arch_randomize_brk(struct mm_struct *mm) @@ -348,9 +348,9 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)