mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-05-04 12:01:41 +02:00
main/linux-lts: upgrade to 6.6.2
This commit is contained in:
Natanael Copa
parent
80aa607209
commit
6f6009a430
@ -0,0 +1,28 @@
|
||||
From b4d7a16d2b76e09ec88ff53a86f6e263c329e160 Mon Sep 17 00:00:00 2001
|
||||
From: Natanael Copa <ncopa@alpinelinux.org>
|
||||
Date: Tue, 28 Nov 2023 14:35:54 +0100
|
||||
Subject: [PATCH 1/5] powerpc/boot/wrapper: Add "-z notext" flag for ppc64le
|
||||
|
||||
This is a follow up to commit 4c078c86b4a4 (powerpc/boot/wrapper: Add
|
||||
"-z notext" flag to disable diagnostic)
|
||||
|
||||
Ref: https://gitlab.alpinelinux.org/alpine/aports/-/issues/14560
|
||||
---
|
||||
arch/powerpc/boot/wrapper | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
|
||||
index 352d7de24018..ceaef956f821 100755
|
||||
--- a/arch/powerpc/boot/wrapper
|
||||
+++ b/arch/powerpc/boot/wrapper
|
||||
@@ -268,6 +268,7 @@ pseries)
|
||||
if [ "$format" != "elf32ppc" ]; then
|
||||
link_address=
|
||||
pie=-pie
|
||||
+ notext='-z notext'
|
||||
fi
|
||||
make_space=n
|
||||
;;
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,144 +0,0 @@
|
||||
From ee0b89dd89af54e9e19d7f33784060b8284aaa2f Mon Sep 17 00:00:00 2001
|
||||
From: Kees Cook <keescook@chromium.org>
|
||||
Date: Sat, 22 Oct 2022 11:29:48 -0700
|
||||
Subject: [PATCH 1/3] tty: Move sysctl setup into "core" tty logic
|
||||
|
||||
In preparation for adding another sysctl to the tty subsystem, move the
|
||||
tty setup code into the "core" tty code, which contains tty_init() itself.
|
||||
|
||||
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Cc: Jiri Slaby <jirislaby@kernel.org>
|
||||
Signed-off-by: Kees Cook <keescook@chromium.org>
|
||||
Link: https://lore.kernel.org/r/20221022182949.2684794-1-keescook@chromium.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
(cherry picked from commit 5fd8c2d3de3dd3cc6d36a0c7a08e44cd5bf173e6)
|
||||
---
|
||||
drivers/tty/tty.h | 2 +-
|
||||
drivers/tty/tty_io.c | 34 ++++++++++++++++++++++++++++++++--
|
||||
drivers/tty/tty_ldisc.c | 38 +-------------------------------------
|
||||
3 files changed, 34 insertions(+), 40 deletions(-)
|
||||
|
||||
diff --git a/drivers/tty/tty.h b/drivers/tty/tty.h
|
||||
index 1c08c9b67b16..f45cd683c02e 100644
|
||||
--- a/drivers/tty/tty.h
|
||||
+++ b/drivers/tty/tty.h
|
||||
@@ -93,7 +93,7 @@ void tty_ldisc_release(struct tty_struct *tty);
|
||||
int __must_check tty_ldisc_init(struct tty_struct *tty);
|
||||
void tty_ldisc_deinit(struct tty_struct *tty);
|
||||
|
||||
-void tty_sysctl_init(void);
|
||||
+extern int tty_ldisc_autoload;
|
||||
|
||||
/* tty_audit.c */
|
||||
#ifdef CONFIG_AUDIT
|
||||
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
|
||||
index 1ac6784ea1f9..1aad59665d40 100644
|
||||
--- a/drivers/tty/tty_io.c
|
||||
+++ b/drivers/tty/tty_io.c
|
||||
@@ -3574,13 +3574,44 @@ void console_sysfs_notify(void)
|
||||
sysfs_notify(&consdev->kobj, NULL, "active");
|
||||
}
|
||||
|
||||
+static struct ctl_table tty_table[] = {
|
||||
+ {
|
||||
+ .procname = "ldisc_autoload",
|
||||
+ .data = &tty_ldisc_autoload,
|
||||
+ .maxlen = sizeof(tty_ldisc_autoload),
|
||||
+ .mode = 0644,
|
||||
+ .proc_handler = proc_dointvec,
|
||||
+ .extra1 = SYSCTL_ZERO,
|
||||
+ .extra2 = SYSCTL_ONE,
|
||||
+ },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+static struct ctl_table tty_dir_table[] = {
|
||||
+ {
|
||||
+ .procname = "tty",
|
||||
+ .mode = 0555,
|
||||
+ .child = tty_table,
|
||||
+ },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
+static struct ctl_table tty_root_table[] = {
|
||||
+ {
|
||||
+ .procname = "dev",
|
||||
+ .mode = 0555,
|
||||
+ .child = tty_dir_table,
|
||||
+ },
|
||||
+ { }
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* Ok, now we can initialize the rest of the tty devices and can count
|
||||
* on memory allocations, interrupts etc..
|
||||
*/
|
||||
int __init tty_init(void)
|
||||
{
|
||||
- tty_sysctl_init();
|
||||
+ register_sysctl_table(tty_root_table);
|
||||
cdev_init(&tty_cdev, &tty_fops);
|
||||
if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
|
||||
register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)
|
||||
@@ -3602,4 +3633,3 @@ int __init tty_init(void)
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
-
|
||||
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
|
||||
index 776d8a62f77c..e758f44729e7 100644
|
||||
--- a/drivers/tty/tty_ldisc.c
|
||||
+++ b/drivers/tty/tty_ldisc.c
|
||||
@@ -117,7 +117,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
|
||||
raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
|
||||
}
|
||||
|
||||
-static int tty_ldisc_autoload = IS_BUILTIN(CONFIG_LDISC_AUTOLOAD);
|
||||
+int tty_ldisc_autoload = IS_BUILTIN(CONFIG_LDISC_AUTOLOAD);
|
||||
|
||||
/**
|
||||
* tty_ldisc_get - take a reference to an ldisc
|
||||
@@ -817,39 +817,3 @@ void tty_ldisc_deinit(struct tty_struct *tty)
|
||||
tty_ldisc_put(tty->ldisc);
|
||||
tty->ldisc = NULL;
|
||||
}
|
||||
-
|
||||
-static struct ctl_table tty_table[] = {
|
||||
- {
|
||||
- .procname = "ldisc_autoload",
|
||||
- .data = &tty_ldisc_autoload,
|
||||
- .maxlen = sizeof(tty_ldisc_autoload),
|
||||
- .mode = 0644,
|
||||
- .proc_handler = proc_dointvec,
|
||||
- .extra1 = SYSCTL_ZERO,
|
||||
- .extra2 = SYSCTL_ONE,
|
||||
- },
|
||||
- { }
|
||||
-};
|
||||
-
|
||||
-static struct ctl_table tty_dir_table[] = {
|
||||
- {
|
||||
- .procname = "tty",
|
||||
- .mode = 0555,
|
||||
- .child = tty_table,
|
||||
- },
|
||||
- { }
|
||||
-};
|
||||
-
|
||||
-static struct ctl_table tty_root_table[] = {
|
||||
- {
|
||||
- .procname = "dev",
|
||||
- .mode = 0555,
|
||||
- .child = tty_dir_table,
|
||||
- },
|
||||
- { }
|
||||
-};
|
||||
-
|
||||
-void tty_sysctl_init(void)
|
||||
-{
|
||||
- register_sysctl_table(tty_root_table);
|
||||
-}
|
||||
--
|
||||
2.40.0
|
||||
|
||||
@ -1,101 +0,0 @@
|
||||
From 9c3c39fa2a07336129efe3444c3992df02b82102 Mon Sep 17 00:00:00 2001
|
||||
From: Kees Cook <keescook@chromium.org>
|
||||
Date: Sat, 22 Oct 2022 11:29:49 -0700
|
||||
Subject: [PATCH 2/3] tty: Allow TIOCSTI to be disabled
|
||||
|
||||
TIOCSTI continues its long history of being used in privilege escalation
|
||||
attacks[1]. Prior attempts to provide a mechanism to disable this have
|
||||
devolved into discussions around creating full-blown LSMs to provide
|
||||
arbitrary ioctl filtering, which is hugely over-engineered -- only
|
||||
TIOCSTI is being used this way. 3 years ago OpenBSD entirely removed
|
||||
TIOCSTI[2], Android has had it filtered for longer[3], and the tools that
|
||||
had historically used TIOCSTI either do not need it, are not commonly
|
||||
built with it, or have had its use removed.
|
||||
|
||||
Provide a simple CONFIG and global sysctl to disable this for the system
|
||||
builders who have wanted this functionality for literally decades now,
|
||||
much like the ldisc_autoload CONFIG and sysctl.
|
||||
|
||||
[1] https://lore.kernel.org/linux-hardening/Y0m9l52AKmw6Yxi1@hostpad
|
||||
[2] https://undeadly.org/cgi?action=article;sid=20170701132619
|
||||
[3] https://lore.kernel.org/lkml/CAFJ0LnFGRuEEn1tCLhoki8ZyWrKfktbF+rwwN7WzyC_kBFoQVA@mail.gmail.com/
|
||||
|
||||
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
Cc: Jiri Slaby <jirislaby@kernel.org>
|
||||
Cc: Simon Brand <simon.brand@postadigitale.de>
|
||||
Signed-off-by: Kees Cook <keescook@chromium.org>
|
||||
Link: https://lore.kernel.org/r/20221022182949.2684794-2-keescook@chromium.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
(cherry picked from commit 83efeeeb3d04b22aaed1df99bc70a48fe9d22c4d)
|
||||
---
|
||||
drivers/tty/Kconfig | 19 +++++++++++++++++++
|
||||
drivers/tty/tty_io.c | 11 +++++++++++
|
||||
2 files changed, 30 insertions(+)
|
||||
|
||||
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
|
||||
index cc30ff93e2e4..d35fc068da74 100644
|
||||
--- a/drivers/tty/Kconfig
|
||||
+++ b/drivers/tty/Kconfig
|
||||
@@ -149,6 +149,25 @@ config LEGACY_PTY_COUNT
|
||||
When not in use, each legacy PTY occupies 12 bytes on 32-bit
|
||||
architectures and 24 bytes on 64-bit architectures.
|
||||
|
||||
+config LEGACY_TIOCSTI
|
||||
+ bool "Allow legacy TIOCSTI usage"
|
||||
+ default y
|
||||
+ help
|
||||
+ Historically the kernel has allowed TIOCSTI, which will push
|
||||
+ characters into a controlling TTY. This continues to be used
|
||||
+ as a malicious privilege escalation mechanism, and provides no
|
||||
+ meaningful real-world utility any more. Its use is considered
|
||||
+ a dangerous legacy operation, and can be disabled on most
|
||||
+ systems.
|
||||
+
|
||||
+ Say 'Y here only if you have confirmed that your system's
|
||||
+ userspace depends on this functionality to continue operating
|
||||
+ normally.
|
||||
+
|
||||
+ This functionality can be changed at runtime with the
|
||||
+ dev.tty.legacy_tiocsti sysctl. This configuration option sets
|
||||
+ the default value of the sysctl.
|
||||
+
|
||||
config LDISC_AUTOLOAD
|
||||
bool "Automatically load TTY Line Disciplines"
|
||||
default y
|
||||
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
|
||||
index 1aad59665d40..e0a0c71ee1b9 100644
|
||||
--- a/drivers/tty/tty_io.c
|
||||
+++ b/drivers/tty/tty_io.c
|
||||
@@ -2270,11 +2270,15 @@ static int tty_fasync(int fd, struct file *filp, int on)
|
||||
* * Called functions take tty_ldiscs_lock
|
||||
* * current->signal->tty check is safe without locks
|
||||
*/
|
||||
+static bool tty_legacy_tiocsti __read_mostly = IS_ENABLED(CONFIG_LEGACY_TIOCSTI);
|
||||
static int tiocsti(struct tty_struct *tty, char __user *p)
|
||||
{
|
||||
char ch, mbz = 0;
|
||||
struct tty_ldisc *ld;
|
||||
|
||||
+ if (!tty_legacy_tiocsti)
|
||||
+ return -EIO;
|
||||
+
|
||||
if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN))
|
||||
return -EPERM;
|
||||
if (get_user(ch, p))
|
||||
@@ -3575,6 +3579,13 @@ void console_sysfs_notify(void)
|
||||
}
|
||||
|
||||
static struct ctl_table tty_table[] = {
|
||||
+ {
|
||||
+ .procname = "legacy_tiocsti",
|
||||
+ .data = &tty_legacy_tiocsti,
|
||||
+ .maxlen = sizeof(tty_legacy_tiocsti),
|
||||
+ .mode = 0644,
|
||||
+ .proc_handler = proc_dobool,
|
||||
+ },
|
||||
{
|
||||
.procname = "ldisc_autoload",
|
||||
.data = &tty_ldisc_autoload,
|
||||
--
|
||||
2.40.0
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
From ed3a698315cbbb85535f0711b8a2bbd206e947cb Mon Sep 17 00:00:00 2001
|
||||
From b7a5aef6b0d761be21e8df6cd11a963f762768ea Mon Sep 17 00:00:00 2001
|
||||
From: Natanael Copa <ncopa@alpinelinux.org>
|
||||
Date: Tue, 13 Dec 2022 16:45:51 +0100
|
||||
Subject: [PATCH] x86: Compress vmlinux with zstd -19 instead of -22
|
||||
Subject: [PATCH 2/5] x86: Compress vmlinux with zstd -19 instead of -22
|
||||
|
||||
This gives slightly bigger kernel but it avoids run out of memory on 32
|
||||
bit kernels with the error:
|
||||
@ -13,10 +13,10 @@ https://forums.gentoo.org/viewtopic-p-8641020.html#8641020
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
|
||||
index 3a261abb6d15..99d2cf707640 100644
|
||||
index 71fc531b95b4..260d38e772b0 100644
|
||||
--- a/arch/x86/boot/compressed/Makefile
|
||||
+++ b/arch/x86/boot/compressed/Makefile
|
||||
@@ -143,7 +143,7 @@ $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
|
||||
@@ -147,7 +147,7 @@ $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE
|
||||
$(obj)/vmlinux.bin.lz4: $(vmlinux.bin.all-y) FORCE
|
||||
$(call if_changed,lz4_with_size)
|
||||
$(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE
|
||||
@ -26,5 +26,5 @@ index 3a261abb6d15..99d2cf707640 100644
|
||||
suffix-$(CONFIG_KERNEL_GZIP) := gz
|
||||
suffix-$(CONFIG_KERNEL_BZIP2) := bz2
|
||||
--
|
||||
2.38.2
|
||||
2.43.0
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
From 819116eb47e3260daaa98b469f5d43b799b1ef9f Mon Sep 17 00:00:00 2001
|
||||
From cf29b5a58ef88adf96317c3c933a16f9c865e09a Mon Sep 17 00:00:00 2001
|
||||
From: Natanael Copa <ncopa@alpinelinux.org>
|
||||
Date: Thu, 14 Jul 2022 13:23:51 +0200
|
||||
Subject: [PATCH] kexec: add kexec_load_disabled boot option
|
||||
Subject: [PATCH 3/5] kexec: add kexec_load_disabled boot option
|
||||
|
||||
Make kexec_load disabled by default and add a boot option to enable it:
|
||||
kexec_load_disabled=0
|
||||
---
|
||||
kernel/kexec_core.c | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
kernel/kexec_core.c | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c
|
||||
index ca2743f9c634..ad6a89cce2de 100644
|
||||
index 9dc728982d79..7650ffe5631e 100644
|
||||
--- a/kernel/kexec_core.c
|
||||
+++ b/kernel/kexec_core.c
|
||||
@@ -928,7 +928,17 @@ int kimage_load_segment(struct kimage *image,
|
||||
@@ -942,7 +942,16 @@ static struct kexec_load_limit load_limit_panic = {
|
||||
|
||||
struct kimage *kexec_image;
|
||||
struct kimage *kexec_crash_image;
|
||||
-int kexec_load_disabled;
|
||||
+int kexec_load_disabled = 1;
|
||||
-static int kexec_load_disabled;
|
||||
+static int kexec_load_disabled = 1;
|
||||
+
|
||||
+static int __init kexec_load_disabled_setup(char *str)
|
||||
+{
|
||||
@ -28,10 +28,9 @@ index ca2743f9c634..ad6a89cce2de 100644
|
||||
+ return 1;
|
||||
+}
|
||||
+__setup("kexec_load_disabled=", kexec_load_disabled_setup);
|
||||
+
|
||||
|
||||
#ifdef CONFIG_SYSCTL
|
||||
static struct ctl_table kexec_core_sysctls[] = {
|
||||
{
|
||||
static int kexec_limit_handler(struct ctl_table *table, int write,
|
||||
--
|
||||
2.38.2
|
||||
2.43.0
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
From e56b2220e4d2affe20e3a91fef204b3dfcbadc14 Mon Sep 17 00:00:00 2001
|
||||
From: Kees Cook <keescook@chromium.org>
|
||||
Date: Sun, 6 Nov 2022 19:46:35 -0800
|
||||
Subject: [PATCH 3/3] tty: Move TIOCSTI toggle variable before kerndoc
|
||||
|
||||
The variable "tty_legacy_tiocsti" should be defined before the kerndoc
|
||||
for the tiocsti() function. The new variable was breaking the "htmldocs"
|
||||
build target:
|
||||
|
||||
drivers/tty/tty_io.c:2271: warning: cannot understand function prototype: 'bool tty_legacy_tiocsti __read_mostly = IS_ENABLED(CONFIG_LEGACY_TIOCSTI); '
|
||||
|
||||
Fixes: 83efeeeb3d04 ("tty: Allow TIOCSTI to be disabled")
|
||||
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||
Link: https://lore.kernel.org/lkml/20221107143434.66f7be35@canb.auug.org.au
|
||||
Cc: Jiri Slaby <jirislaby@kernel.org>
|
||||
Signed-off-by: Kees Cook <keescook@chromium.org>
|
||||
Acked-by: Randy Dunlap <rdunlap@infradead.org>
|
||||
Link: https://lore.kernel.org/r/20221107034631.never.637-kees@kernel.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
(cherry picked from commit 5c30f3e4a6e67c88c979ad30554bf4ef9b24fbd0)
|
||||
---
|
||||
drivers/tty/tty_io.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
|
||||
index e0a0c71ee1b9..99a9fc7cba12 100644
|
||||
--- a/drivers/tty/tty_io.c
|
||||
+++ b/drivers/tty/tty_io.c
|
||||
@@ -2257,6 +2257,7 @@ static int tty_fasync(int fd, struct file *filp, int on)
|
||||
return retval;
|
||||
}
|
||||
|
||||
+static bool tty_legacy_tiocsti __read_mostly = IS_ENABLED(CONFIG_LEGACY_TIOCSTI);
|
||||
/**
|
||||
* tiocsti - fake input character
|
||||
* @tty: tty to fake input into
|
||||
@@ -2270,7 +2271,6 @@ static int tty_fasync(int fd, struct file *filp, int on)
|
||||
* * Called functions take tty_ldiscs_lock
|
||||
* * current->signal->tty check is safe without locks
|
||||
*/
|
||||
-static bool tty_legacy_tiocsti __read_mostly = IS_ENABLED(CONFIG_LEGACY_TIOCSTI);
|
||||
static int tiocsti(struct tty_struct *tty, char __user *p)
|
||||
{
|
||||
char ch, mbz = 0;
|
||||
--
|
||||
2.40.0
|
||||
|
||||
26
main/linux-lts/0004-objtool-respect-AWK-setting.patch
Normal file
26
main/linux-lts/0004-objtool-respect-AWK-setting.patch
Normal file
@ -0,0 +1,26 @@
|
||||
From dc34b09b20b7aa88ca55742a113d223f33c09c32 Mon Sep 17 00:00:00 2001
|
||||
From: Natanael Copa <ncopa@alpinelinux.org>
|
||||
Date: Tue, 28 Nov 2023 14:22:46 +0100
|
||||
Subject: [PATCH 4/5] objtool: respect AWK setting
|
||||
|
||||
AWK= is not passed on as an makefile argument so we need pass it as an env.
|
||||
---
|
||||
tools/objtool/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
|
||||
index 83b100c1e7f6..6ccddfa6de4f 100644
|
||||
--- a/tools/objtool/Makefile
|
||||
+++ b/tools/objtool/Makefile
|
||||
@@ -42,7 +42,7 @@ OBJTOOL_CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
|
||||
# Always want host compilation.
|
||||
HOST_OVERRIDES := CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)"
|
||||
|
||||
-AWK = awk
|
||||
+AWK ?= awk
|
||||
MKDIR = mkdir
|
||||
|
||||
ifeq ($(V),1)
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
From 631b4d062748410858bc873ad65e145e58dfe4e9 Mon Sep 17 00:00:00 2001
|
||||
From 0306d648bbd12489c9ffbe8f5bd9cc82fa5eadd8 Mon Sep 17 00:00:00 2001
|
||||
From: Ariadne Conill <ariadne@dereferenced.org>
|
||||
Date: Tue, 18 Feb 2020 21:10:22 +0000
|
||||
Subject: [PATCH] powerpc: config: defang gcc check for stack-protector support
|
||||
Subject: [PATCH 5/5] powerpc: config: defang gcc check for stack-protector
|
||||
support
|
||||
|
||||
When we rebase kernel configs in Alpine, it is common to do so from
|
||||
an environment where CARCH does not match CHOST.
|
||||
@ -16,10 +17,10 @@ Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
|
||||
index 2ca5418457ed..b62dab194e8e 100644
|
||||
index d5d5388973ac..0ba9d88de22f 100644
|
||||
--- a/arch/powerpc/Kconfig
|
||||
+++ b/arch/powerpc/Kconfig
|
||||
@@ -248,8 +248,7 @@ config PPC
|
||||
@@ -271,8 +271,7 @@ config PPC
|
||||
select HAVE_RSEQ
|
||||
select HAVE_SETUP_PER_CPU_AREA if PPC64
|
||||
select HAVE_SOFTIRQ_ON_OWN_STACK
|
||||
@ -30,5 +31,5 @@ index 2ca5418457ed..b62dab194e8e 100644
|
||||
select HAVE_SYSCALL_TRACEPOINTS
|
||||
select HAVE_VIRT_CPU_ACCOUNTING
|
||||
--
|
||||
2.38.2
|
||||
2.43.0
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
_flavor=lts
|
||||
pkgname=linux-$_flavor
|
||||
pkgver=6.1.63
|
||||
pkgver=6.6.2
|
||||
case $pkgver in
|
||||
*.*.*) _kernver=${pkgver%.*};;
|
||||
*.*) _kernver=$pkgver;;
|
||||
@ -17,14 +17,11 @@ makedepends="$_depends_dev sed installkernel bc linux-headers linux-firmware-any
|
||||
options="!strip"
|
||||
_config=${config:-config-lts.${CARCH}}
|
||||
source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz
|
||||
0001-powerpc-config-defang-gcc-check-for-stack-protector-.patch
|
||||
0001-x86-Compress-vmlinux-with-zstd-19-instead-of-22.patch
|
||||
0001-kexec-add-kexec_load_disabled-boot-option.patch
|
||||
awk.patch
|
||||
ppc-notext.patch
|
||||
0001-tty-Move-sysctl-setup-into-core-tty-logic.patch
|
||||
0002-tty-Allow-TIOCSTI-to-be-disabled.patch
|
||||
0003-tty-Move-TIOCSTI-toggle-variable-before-kerndoc.patch
|
||||
0001-powerpc-boot-wrapper-Add-z-notext-flag-for-ppc64le.patch
|
||||
0002-x86-Compress-vmlinux-with-zstd-19-instead-of-22.patch
|
||||
0003-kexec-add-kexec_load_disabled-boot-option.patch
|
||||
0004-objtool-respect-AWK-setting.patch
|
||||
0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch
|
||||
|
||||
lts.aarch64.config
|
||||
lts.armv7.config
|
||||
@ -338,15 +335,12 @@ _dev() {
|
||||
}
|
||||
|
||||
sha512sums="
|
||||
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 linux-6.1.tar.xz
|
||||
a6c826e8c3884550fbe1dee3771b201b3395b073369f7fbfb5dc4aa5501e848b0bbc3a5ad80d932a6a50cbe0cfd579c75662f0c43ef79a38c1c6848db395c4c8 0001-powerpc-config-defang-gcc-check-for-stack-protector-.patch
|
||||
55f732c01e10948b283eb1cc77ce3f1169428251075f8f5dd3100d8fda1f08b6b3850969b84b42a52468d4f7c7ec7b49d01f0dff3c20c30f2e9ac0c07071b9d3 0001-x86-Compress-vmlinux-with-zstd-19-instead-of-22.patch
|
||||
5464cf4b2e251972091cc9d5138291a94298737e98ec24829829203fc879593b440a7cd1ca08e6d01debaab2887976cb5d38fae2fbe5149cef1735d5d73bb086 0001-kexec-add-kexec_load_disabled-boot-option.patch
|
||||
3816cfc8dd14d1c5ced05bbf19b099472c9bbbd1abced32cbb4b6b5baecfaa28c345e4e522648837d98e5bc7c311810cae9160f4c91019bb857a3857076b8e0e awk.patch
|
||||
c74488940244ba032e741c370767467cfab93b89077b5dfccfed39b658f381e0995527e6c61de53b1c112b04ba647bfccf00f2e05c0637d3c703680a508821cc ppc-notext.patch
|
||||
f8582538a8482656138a0ae56b67a6d3cec09ff8d82a3f790ffa3fa7c37d0ae24a04f01f0ae1aec09838f86490907995c2568be7841a3821f0e64704f60153e5 0001-tty-Move-sysctl-setup-into-core-tty-logic.patch
|
||||
0bfd2c138e997f25f821cd518263ad515fc303bbde37bcdb7dd651d30316c77652fec6fedb195102b8476b92b1e7269c143dad5df6431db49c4318375ad2e802 0002-tty-Allow-TIOCSTI-to-be-disabled.patch
|
||||
8b245ec672a56dae7ce82f488880f6f3c0b65776177db663a29f26de752bf2cefe6b677e2cedbebd85e98d6f6e3d66b9f198a0d7a6042a20191b5ca8f4a749e7 0003-tty-Move-TIOCSTI-toggle-variable-before-kerndoc.patch
|
||||
458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35 linux-6.6.tar.xz
|
||||
58bf9e84fb01f811f0cada7f7953d111908f0b0650648d6a3522061fe08c9fe284c9315515ae386189253e37d0c92419f78048d6568e2e426654b1e61010685f 0001-powerpc-boot-wrapper-Add-z-notext-flag-for-ppc64le.patch
|
||||
763dcb40f698d43b0bb856f44493973e840b66efe62a8fd41a08b6e3fa38cf903e059d107be3735ab2f38a0f27bdb0262798e5e530a1905f96195cd8bcf62fdf 0002-x86-Compress-vmlinux-with-zstd-19-instead-of-22.patch
|
||||
75f232b6becee7d36d360ffaf2aaa837d13518f9ec620ca159bcb2a0e98eb18a77631406a9b44244ea0164a7ed59fad583823909681e9b894a012f9d13365b69 0003-kexec-add-kexec_load_disabled-boot-option.patch
|
||||
2956050bb332411d00a285e9656618f2e34b631492bbc19bef54d83a6e91b8531f4e18830b9313cfe52fbf8a8ca6fb76cf55b3ddd146ca3b977046cf2fd10cad 0004-objtool-respect-AWK-setting.patch
|
||||
4b16f15b47b5e5835b926126e39723f519290469517875cfb2d2b857a93ad1344f0d1ba4b255289e20f4da9c867647526b344f752981cee0a48c51577badac3f 0005-powerpc-config-defang-gcc-check-for-stack-protector-.patch
|
||||
c7812e03292ceae7c1613328a6792af2f91c8b0bcc3ecb4c94933a71b0b5faa2158a6819dcda54d3df1a9b63bf306a8211cbbccc3cde5a8067093f3b2a11e36f lts.aarch64.config
|
||||
e4ad1b97e4862442dc28c47115ab992ff4e8e66774d402b292800008993b8453d1e4c18fd1d1a78beecd1e9dba26a7d1c31735d23e0bc606e611a8a351024b1f lts.armv7.config
|
||||
98b5b8ab524bc6a36a41e2c07644b85b477ee1a2b68985276da261a12db49c8bae307a47cd7ebd80bed6fa853b0c5f604c542ee3591c6dbae002fd51b04322b8 lts.x86.config
|
||||
@ -358,5 +352,5 @@ e4ad1b97e4862442dc28c47115ab992ff4e8e66774d402b292800008993b8453d1e4c18fd1d1a78b
|
||||
ed880584fb07b1ceb599ce528c48bc75ebeca2b1d8dae7efa713e7397a6ace98162e9d775d9c957ec2df733b1b13a444e9ae8b915d26b38bbb02c39f3c16fd49 virt.ppc64le.config
|
||||
1bde69c44b5f30679ee8925689a630887ff84822286c3876bd539ad66986fdbd71b57ca195cd02e8259b8f537403de4b21ca2d11d6a43f9e6928e9770c2aff23 virt.x86.config
|
||||
4aa7c84eee75820d4a7c166d69de0630c08107fe0e45d1d7b7a1f84acca12164516ea99dd1087335762f90014858513bd150823b73eb3f92f9eb934634544758 virt.x86_64.config
|
||||
7b269c73a7923ee75ac695d8242dd93e9bdad6ce3e8f4acf29591ef2be0fabdce5bfdf3c2b7b1d28f5de4f5bbb880a07e11c4882041867b6e3fd54ee22feb668 patch-6.1.63.xz
|
||||
b9abd0117714e57c00a62f9dbe2e8439440419ed232ec3b87c3ecbc3fa740e29f7abcba41a381d589c138438f8cf5c4614d705053584a292102eb6bc7050bb45 patch-6.6.2.xz
|
||||
"
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
tools/objtool does not pass AWK= as an makefile argument so we need pass it as an env.
|
||||
|
||||
diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
|
||||
index 92ce4fc..cfedb0c 100644
|
||||
--- a/tools/objtool/Makefile
|
||||
+++ b/tools/objtool/Makefile
|
||||
@@ -37,7 +37,7 @@ LDFLAGS += $(LIBELF_LIBS) $(LIBSUBCMD) $(KBUILD_HOSTLDFLAGS)
|
||||
elfshdr := $(shell echo '$(pound)include <libelf.h>' | $(CC) $(CFLAGS) -x c -E - | grep elf_getshdr)
|
||||
CFLAGS += $(if $(elfshdr),,-DLIBELF_USE_DEPRECATED)
|
||||
|
||||
-AWK = awk
|
||||
+AWK ?= awk
|
||||
|
||||
SUBCMD_CHECK := n
|
||||
SUBCMD_ORC := n
|
||||
@ -1,16 +0,0 @@
|
||||
See:
|
||||
https://gitlab.alpinelinux.org/alpine/aports/-/issues/14560
|
||||
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/arch/powerpc/boot/wrapper?id=4c078c86b4a466db221a08d423c2eae9332c2641
|
||||
|
||||
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
|
||||
index 5bdd4dd20bbb..4ab2f8316dac 100755
|
||||
--- a/arch/powerpc/boot/wrapper
|
||||
+++ b/arch/powerpc/boot/wrapper
|
||||
@@ -251,6 +251,7 @@ pseries)
|
||||
if [ "$format" != "elf32ppc" ]; then
|
||||
link_address=
|
||||
pie=-pie
|
||||
+ notext='-z notext'
|
||||
fi
|
||||
make_space=n
|
||||
;;
|
||||
Loading…
x
Reference in New Issue
Block a user