From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 62667a709f9ed5e996e43ebb38bd11ff9e6b559f
Date: Tue, 11 Feb 2014 17:25:29 +0100 [thread overview]
Message-ID: <20140211162553.1EA2E20406@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 5015 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 62667a709f9ed5e996e43ebb38bd11ff9e6b559f (commit)
via a25a2c3190cb841af64d10f1e7197011c0aac969 (commit)
from 64feb1fcc848d0dd8bd7a52dd61b9ec96e95b0b7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 62667a709f9ed5e996e43ebb38bd11ff9e6b559f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 16:54:48 2014 +0100
linux: Fix grsecurity-related crash on Intel Haswell CPUs.
commit a25a2c3190cb841af64d10f1e7197011c0aac969
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Feb 11 16:54:09 2014 +0100
tor: Update to 0.2.4.20.
-----------------------------------------------------------------------
Summary of changes:
lfs/linux | 1 +
lfs/tor | 4 +-
src/patches/grsecurity-haswell-32bit-fix.patch | 53 ++++++++++++++++++++++++++
3 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 src/patches/grsecurity-haswell-32bit-fix.patch
Difference in files:
diff --git a/lfs/linux b/lfs/linux
index a422d7a..08fa9a3 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -124,6 +124,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ifneq "$(KCFG)" "-headers"
cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1
cd $(DIR_APP) && rm localversion-grsec
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/grsecurity-haswell-32bit-fix.patch
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch
endif
diff --git a/lfs/tor b/lfs/tor
index 10eaca4..9669ea7 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -24,7 +24,7 @@
include Config
-VER = 0.2.4.18-rc
+VER = 0.2.4.20
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6cc5bc776e9d61a9fb1b000609ed2692
+$(DL_FILE)_MD5 = a8cd8e3b3a3f6a7770f2c22d280f19b8
install : $(TARGET)
diff --git a/src/patches/grsecurity-haswell-32bit-fix.patch b/src/patches/grsecurity-haswell-32bit-fix.patch
new file mode 100644
index 0000000..abff2b0
--- /dev/null
+++ b/src/patches/grsecurity-haswell-32bit-fix.patch
@@ -0,0 +1,53 @@
+diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
+index 7430027..2124e35 100644
+--- a/arch/x86/include/asm/mmu_context.h
++++ b/arch/x86/include/asm/mmu_context.h
+@@ -80,7 +80,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+ #if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ if (static_cpu_has(X86_FEATURE_PCID)) {
+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
+- unsigned long descriptor[2];
++ u64 descriptor[2];
+ descriptor[0] = PCID_USER;
+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
+ } else {
+@@ -144,7 +144,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
+ #if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
+ if (static_cpu_has(X86_FEATURE_PCID)) {
+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
+- unsigned long descriptor[2];
++ u64 descriptor[2];
+ descriptor[0] = PCID_USER;
+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
+ } else {
+diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
+index 45844c0..ada2172 100644
+--- a/arch/x86/include/asm/tlbflush.h
++++ b/arch/x86/include/asm/tlbflush.h
+@@ -18,7 +18,7 @@
+ static inline void __native_flush_tlb(void)
+ {
+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
+- unsigned long descriptor[2];
++ u64 descriptor[2];
+
+ descriptor[0] = PCID_KERNEL;
+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_MONGLOBAL) : "memory");
+@@ -42,7 +42,7 @@ static inline void __native_flush_tlb(void)
+ static inline void __native_flush_tlb_global_irq_disabled(void)
+ {
+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
+- unsigned long descriptor[2];
++ u64 descriptor[2];
+
+ descriptor[0] = PCID_KERNEL;
+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
+@@ -77,7 +77,7 @@ static inline void __native_flush_tlb_single(unsigned long addr)
+ {
+
+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
+- unsigned long descriptor[2];
++ u64 descriptor[2];
+
+ descriptor[0] = PCID_KERNEL;
+ descriptor[1] = addr;
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-02-11 16:25 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140211162553.1EA2E20406@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox