5.15.27 hardened bump (#455)

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

View File

@@ -102,13 +102,13 @@ index d91ab28718d4..4ead5cd52644 100644
If set, provide RFC2861 behavior and time out the congestion
window after an idle period. An idle period is defined at
diff --git a/Makefile b/Makefile
index c50d4ec83be8..a88b0b67c745 100644
index 6a422b34582a..181a51b59f0e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 15
SUBLEVEL = 25
SUBLEVEL = 27
-EXTRAVERSION =
+EXTRAVERSION = -hardened1
NAME = Trick or Treat
@@ -1232,10 +1232,10 @@ index 33a4240e6a6f..82213f9c4c17 100644
{
return &init_user_ns;
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
+++ 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; }
#endif
@@ -1497,7 +1497,7 @@ index b81652fc2cdd..fce3ec1a1e1b 100644
return err;
diff --git a/kernel/fork.c b/kernel/fork.c
index 28aee1a8875b..475372883e06 100644
index 89475c994ca9..cbc13a0b7e57 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -82,6 +82,7 @@
@@ -1519,7 +1519,7 @@ index 28aee1a8875b..475372883e06 100644
/*
* Thread groups must share signals as well, and detached threads
* 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)
unshare_flags |= CLONE_FS;
@@ -1848,7 +1848,7 @@ index 85f1021ad459..d14f7857c31d 100644
struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
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
+++ b/kernel/user_namespace.c
@@ -21,6 +21,13 @@
@@ -2695,7 +2695,7 @@ index af3cad4e5378..f7bca4651ed5 100644
void __put_page(struct page *page)
diff --git a/mm/util.c b/mm/util.c
index bacabe446906..a3bcc8aef4b4 100644
index ea09dd33ab59..523194016e8e 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -348,9 +348,9 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)