diff --git a/kernel.spec b/kernel.spec index 32e4a1c..d602d11 100644 --- a/kernel.spec +++ b/kernel.spec @@ -62,7 +62,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -%global baserelease 202 +%global baserelease 201 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -74,7 +74,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 7 +%define stable_update 8 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -748,9 +748,6 @@ Patch22247: ath9k_rx_dma_stop_check.patch #rhbz 903192 Patch22261: 0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch -#rhbz 914737 -Patch22262: x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch - #rhbz 916544 Patch22263: 0001-drivers-crypto-nx-fix-init-race-alignmasks-and-GCM-b.patch @@ -793,9 +790,6 @@ Patch25007: fix-child-thread-introspection.patch #rhbz 844750 Patch25008: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch -#CVE-xxxx-xxxx rhbz 952197 952217 -Patch25009: tracing-Fix-possible-NULL-pointer-dereferences.patch - #rhbz 919176 Patch25010: wireless-regulatory-fix-channel-disabling-race-condition.patch @@ -1501,9 +1495,6 @@ ApplyPatch alps-v2.patch #rhbz 903192 ApplyPatch 0001-kmsg-Honor-dmesg_restrict-sysctl-on-dev-kmsg.patch -#rhbz 914737 -ApplyPatch x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch - #rhbz 916544 ApplyPatch 0001-drivers-crypto-nx-fix-init-race-alignmasks-and-GCM-b.patch @@ -1545,9 +1536,6 @@ ApplyPatch fix-child-thread-introspection.patch ApplyPatch 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch -#CVE-xxxx-xxxx rhbz 952197 952217 -ApplyPatch tracing-Fix-possible-NULL-pointer-dereferences.patch - #rhbz 919176 ApplyPatch wireless-regulatory-fix-channel-disabling-race-condition.patch @@ -2411,6 +2399,9 @@ fi # ||----w | # || || %changelog +* Wed Apr 17 2013 Josh Boyer - 3.8.8-201 +- Linux v3.8.8 + * Tue Apr 16 2013 Josh Boyer - Fix uninitialized variable free in iwlwifi (rhbz 951241) - Fix race in regulatory code (rhbz 919176) diff --git a/sources b/sources index 54f3c6b..7c8f0e1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 1c738edfc54e7c65faeb90c436104e2f linux-3.8.tar.xz -d166692330220c425d69db82c9d693b6 patch-3.8.7.xz +08cdcef928c2ca402adf1c444a3c43ac patch-3.8.8.xz diff --git a/tracing-Fix-possible-NULL-pointer-dereferences.patch b/tracing-Fix-possible-NULL-pointer-dereferences.patch deleted file mode 100644 index 71af4dd..0000000 --- a/tracing-Fix-possible-NULL-pointer-dereferences.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 6a76f8c0ab19f215af2a3442870eeb5f0e81998d Mon Sep 17 00:00:00 2001 -From: Namhyung Kim -Date: Thu, 11 Apr 2013 15:55:01 +0900 -Subject: [PATCH] tracing: Fix possible NULL pointer dereferences - -Currently set_ftrace_pid and set_graph_function files use seq_lseek -for their fops. However seq_open() is called only for FMODE_READ in -the fops->open() so that if an user tries to seek one of those file -when she open it for writing, it sees NULL seq_file and then panic. - -It can be easily reproduced with following command: - - $ cd /sys/kernel/debug/tracing - $ echo 1234 | sudo tee -a set_ftrace_pid - -In this example, GNU coreutils' tee opens the file with fopen(, "a") -and then the fopen() internally calls lseek(). - -Link: http://lkml.kernel.org/r/1365663302-2170-1-git-send-email-namhyung@kernel.org - -Cc: Frederic Weisbecker -Cc: Ingo Molnar -Cc: Namhyung Kim -Cc: stable@vger.kernel.org -Signed-off-by: Namhyung Kim -Signed-off-by: Steven Rostedt ---- - include/linux/ftrace.h | 2 +- - kernel/trace/ftrace.c | 10 +++++----- - kernel/trace/trace_stack.c | 2 +- - 3 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h -index 167abf9..eb3ce32 100644 ---- a/include/linux/ftrace.h -+++ b/include/linux/ftrace.h -@@ -396,7 +396,7 @@ ssize_t ftrace_filter_write(struct file *file, const char __user *ubuf, - size_t cnt, loff_t *ppos); - ssize_t ftrace_notrace_write(struct file *file, const char __user *ubuf, - size_t cnt, loff_t *ppos); --loff_t ftrace_regex_lseek(struct file *file, loff_t offset, int whence); -+loff_t ftrace_filter_lseek(struct file *file, loff_t offset, int whence); - int ftrace_regex_release(struct inode *inode, struct file *file); - - void __init -diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c -index 926ebfb..affc35d 100644 ---- a/kernel/trace/ftrace.c -+++ b/kernel/trace/ftrace.c -@@ -2697,7 +2697,7 @@ ftrace_notrace_open(struct inode *inode, struct file *file) - } - - loff_t --ftrace_regex_lseek(struct file *file, loff_t offset, int whence) -+ftrace_filter_lseek(struct file *file, loff_t offset, int whence) - { - loff_t ret; - -@@ -3570,7 +3570,7 @@ static const struct file_operations ftrace_filter_fops = { - .open = ftrace_filter_open, - .read = seq_read, - .write = ftrace_filter_write, -- .llseek = ftrace_regex_lseek, -+ .llseek = ftrace_filter_lseek, - .release = ftrace_regex_release, - }; - -@@ -3578,7 +3578,7 @@ static const struct file_operations ftrace_notrace_fops = { - .open = ftrace_notrace_open, - .read = seq_read, - .write = ftrace_notrace_write, -- .llseek = ftrace_regex_lseek, -+ .llseek = ftrace_filter_lseek, - .release = ftrace_regex_release, - }; - -@@ -3783,8 +3783,8 @@ static const struct file_operations ftrace_graph_fops = { - .open = ftrace_graph_open, - .read = seq_read, - .write = ftrace_graph_write, -+ .llseek = ftrace_filter_lseek, - .release = ftrace_graph_release, -- .llseek = seq_lseek, - }; - #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ - -@@ -4439,7 +4439,7 @@ static const struct file_operations ftrace_pid_fops = { - .open = ftrace_pid_open, - .write = ftrace_pid_write, - .read = seq_read, -- .llseek = seq_lseek, -+ .llseek = ftrace_filter_lseek, - .release = ftrace_pid_release, - }; - -diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c -index 42ca822..83a8b5b 100644 ---- a/kernel/trace/trace_stack.c -+++ b/kernel/trace/trace_stack.c -@@ -322,7 +322,7 @@ static const struct file_operations stack_trace_filter_fops = { - .open = stack_trace_filter_open, - .read = seq_read, - .write = ftrace_filter_write, -- .llseek = ftrace_regex_lseek, -+ .llseek = ftrace_filter_lseek, - .release = ftrace_regex_release, - }; - --- -1.8.1.4 - diff --git a/x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch b/x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch deleted file mode 100644 index 31b0de8..0000000 --- a/x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Samu Kallio <> -Subject: [PATCH] x86: mm: Fix vmalloc_fault oops during lazy MMU updates. -Date: Sun, 17 Feb 2013 04:35:52 +0200 - -In paravirtualized x86_64 kernels, vmalloc_fault may cause an oops -when lazy MMU updates are enabled, because set_pgd effects are being -deferred. - -One instance of this problem is during process mm cleanup with memory -cgroups enabled. The chain of events is as follows: - -- zap_pte_range enables lazy MMU updates -- zap_pte_range eventually calls mem_cgroup_charge_statistics, - which accesses the vmalloc'd mem_cgroup per-cpu stat area -- vmalloc_fault is triggered which tries to sync the corresponding - PGD entry with set_pgd, but the update is deferred -- vmalloc_fault oopses due to a mismatch in the PUD entries - -Calling arch_flush_lazy_mmu_mode immediately after set_pgd makes the -changes visible to the consistency checks. - -Signed-off-by: Samu Kallio ---- - arch/x86/mm/fault.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) -diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c -index 8e13ecb..0a45298 100644 ---- a/arch/x86/mm/fault.c -+++ b/arch/x86/mm/fault.c -@@ -378,10 +378,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address) - if (pgd_none(*pgd_ref)) - return -1; - -- if (pgd_none(*pgd)) -+ if (pgd_none(*pgd)) { - set_pgd(pgd, *pgd_ref); -- else -+ arch_flush_lazy_mmu_mode(); -+ } else { - BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref)); -+ } - - /* - * Below here mismatches are bugs because these lower tables --- -1.8.1.3 - -