[kernel/f12/master] Linux 2.6.32.22

Chuck Ebbert cebbert at fedoraproject.org
Mon Sep 20 22:49:03 UTC 2010 

commit 7eb61976f83097b3e69cac1215317e9d1f96925c
Author: Chuck Ebbert <cebbert at redhat.com>
Date:   Mon Sep 20 18:48:03 2010 -0400

    Linux 2.6.32.22
    
    Drop merged patches:
    01-compat-make-compat_alloc_user_space-incorporate-the-access_ok-check.patch
    02-compat-test-rax-for-the-system-call-number-not-eax.patch
    03-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
    hid-01-usbhid-initialize-interface-pointers-early-enough.patch
    hid-02-fix-suspend-crash-by-moving-initializations-earlier.patch
    alsa-seq-oss-fix-double-free-at-error-path-of-snd_seq_oss_open.patch
    tracing-do-not-allow-llseek-to-set_ftrace_filter.patch

 ...ser_space-incorporate-the-access_ok-check.patch |  198 --------------------
 ...st-rax-for-the-system-call-number-not-eax.patch |   97 ----------
 ...cate-rax-after-ia32-syscall-entry-tracing.patch |   49 -----
 ...le-free-at-error-path-of-snd_seq_oss_open.patch |   53 ------
 drm-upgrayedd.patch                                |    2 +-
 ...nitialize-interface-pointers-early-enough.patch |   40 ----
 ...d-crash-by-moving-initializations-earlier.patch |   53 ------
 kernel.spec                                        |   39 ++---
 sources                                            |    2 +-
 ...-do-not-allow-llseek-to-set_ftrace_filter.patch |   51 -----
 10 files changed, 16 insertions(+), 568 deletions(-)
---
diff --git a/drm-upgrayedd.patch b/drm-upgrayedd.patch
index 08f039b..2530bec 100644
--- a/drm-upgrayedd.patch
+++ b/drm-upgrayedd.patch
@@ -10283,7 +10283,7 @@ index 601415d..b27202d 100644
 +	dev_priv->pipe_to_crtc_mapping[intel_crtc->pipe] = &intel_crtc->base;
 +
  	intel_crtc->cursor_addr = 0;
- 	intel_crtc->dpms_mode = DRM_MODE_DPMS_OFF;
+ 	intel_crtc->dpms_mode = -1;
  	drm_crtc_helper_add(&intel_crtc->base, &intel_helper_funcs);
 @@ -4036,7 +4382,7 @@ static void intel_setup_outputs(struct drm_device *dev)
  	if (IS_MOBILE(dev) && !IS_I830(dev))
diff --git a/kernel.spec b/kernel.spec
index a7b0070..db75c73 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -47,7 +47,7 @@ Summary: The Linux kernel
 # reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
 # scripts/rebase.sh should be made to do that for you, actually.
 #
-%global baserelease 168
+%global baserelease 169
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -59,7 +59,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 21
+%define stable_update 22
 # Is it a -stable RC?
 %define stable_rc 0
 # Set rpm version accordingly
@@ -638,9 +638,6 @@ Patch21: linux-2.6-tracehook.patch
 Patch22: linux-2.6-utrace.patch
 Patch23: linux-2.6-utrace-ptrace.patch
 
-Patch100: 01-compat-make-compat_alloc_user_space-incorporate-the-access_ok-check.patch
-Patch101: 02-compat-test-rax-for-the-system-call-number-not-eax.patch
-Patch102: 03-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
 Patch103: aio-check-for-multiplication-overflow-in-do_io_submit.patch
 
 Patch141: linux-2.6-ps3-storage-alias.patch
@@ -840,9 +837,6 @@ Patch14050: crypto-add-async-hash-testing.patch
 # Red Hat Bugzilla #610911
 Patch14130: kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
 
-Patch14140: hid-01-usbhid-initialize-interface-pointers-early-enough.patch
-Patch14141: hid-02-fix-suspend-crash-by-moving-initializations-earlier.patch
-
 Patch14150: irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
 
 Patch14200: net-do-not-check-capable-if-kernel.patch
@@ -852,13 +846,9 @@ Patch14210: execve-improve-interactivity-with-large-arguments.patch
 Patch14211: execve-make-responsive-to-sigkill-with-large-arguments.patch
 Patch14212: setup_arg_pages-diagnose-excessive-argument-size.patch
 
-# CVE-2010-3080
-Patch14220: alsa-seq-oss-fix-double-free-at-error-path-of-snd_seq_oss_open.patch
 # CVE-2010-2960
 Patch14230: keys-fix-bug-in-keyctl_session_to_parent-if-parent-has-no-session-keyring.patch
 Patch14231: keys-fix-rcu-no-lock-warning-in-keyctl_session_to_parent.patch
-# CVE-2010-3079
-Patch14240: tracing-do-not-allow-llseek-to-set_ftrace_filter.patch
 
 # ==============================================================================
 %endif
@@ -1300,11 +1290,6 @@ ApplyPatch linux-2.6-utrace-ptrace.patch
 ApplyPatch via-hwmon-temp-sensor.patch
 ApplyPatch linux-2.6-dell-laptop-rfkill-fix.patch
 
-ApplyPatch 01-compat-make-compat_alloc_user_space-incorporate-the-access_ok-check.patch
-ApplyPatch 02-compat-test-rax-for-the-system-call-number-not-eax.patch
-ApplyPatch 03-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
-
-
 #
 # Intel IOMMU
 #
@@ -1338,6 +1323,7 @@ ApplyPatch linux-2.6-execshield.patch
 #
 # bugfixes to drivers and filesystems
 #
+# CVE-2010-3067
 ApplyPatch aio-check-for-multiplication-overflow-in-do_io_submit.patch
 
 # ext4
@@ -1569,10 +1555,6 @@ ApplyPatch crypto-add-async-hash-testing.patch
 
 ApplyPatch kvm-mmu-fix-conflict-access-permissions-in-direct-sp.patch
 
-# RHBZ #592785
-ApplyPatch hid-01-usbhid-initialize-interface-pointers-early-enough.patch
-ApplyPatch hid-02-fix-suspend-crash-by-moving-initializations-earlier.patch
-
 # CVE-2010-2954
 ApplyPatch irda-correctly-clean-up-self-ias_obj-on-irda_bind-failure.patch
 
@@ -1584,13 +1566,9 @@ ApplyPatch execve-improve-interactivity-with-large-arguments.patch
 ApplyPatch execve-make-responsive-to-sigkill-with-large-arguments.patch
 ApplyPatch setup_arg_pages-diagnose-excessive-argument-size.patch
 
-# CVE-2010-3080
-ApplyPatch alsa-seq-oss-fix-double-free-at-error-path-of-snd_seq_oss_open.patch
 # CVE-2010-2960
 ApplyPatch keys-fix-bug-in-keyctl_session_to_parent-if-parent-has-no-session-keyring.patch
 ApplyPatch keys-fix-rcu-no-lock-warning-in-keyctl_session_to_parent.patch
-# CVE-2010-3079
-ApplyPatch tracing-do-not-allow-llseek-to-set_ftrace_filter.patch
 
 # END OF PATCH APPLICATIONS ====================================================
 %endif
@@ -2244,6 +2222,17 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Sep 20 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.21-169
+- Linux 2.6.32.22
+- Drop merged patches:
+  01-compat-make-compat_alloc_user_space-incorporate-the-access_ok-check.patch
+  02-compat-test-rax-for-the-system-call-number-not-eax.patch
+  03-compat-retruncate-rax-after-ia32-syscall-entry-tracing.patch
+  hid-01-usbhid-initialize-interface-pointers-early-enough.patch
+  hid-02-fix-suspend-crash-by-moving-initializations-earlier.patch
+  alsa-seq-oss-fix-double-free-at-error-path-of-snd_seq_oss_open.patch
+  tracing-do-not-allow-llseek-to-set_ftrace_filter.patch
+
 * Tue Sep 14 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.32.21-168
 - Fix three CVEs:
   CVE-2010-3080: /dev/sequencer open failure is not handled correctly
diff --git a/sources b/sources
index aa75510..2f21808 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 260551284ac224c3a43c4adac7df4879  linux-2.6.32.tar.bz2
-29aa10a231882a6e52908642b572326f  patch-2.6.32.21.bz2
+da1431a1d659298c6bd11714416c840f  patch-2.6.32.22.bz2

More information about the scm-commits mailing list