From 9520d51b59fa1182701c1766f0cf322e1d93d8c9 Mon Sep 17 00:00:00 2001 From: Justin M. Forbes Date: May 14 2012 18:39:52 +0000 Subject: Linux 3.3.6 --- diff --git a/KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch b/KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch deleted file mode 100644 index 7e1664f..0000000 --- a/KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 5b40572ed5f0344b9dbee486a17c589ce1abe1a3 Mon Sep 17 00:00:00 2001 -From: Avi Kivity -Date: Mon, 5 Mar 2012 14:23:29 +0200 -Subject: [PATCH] KVM: Ensure all vcpus are consistent with in-kernel irqchip - settings - -If some vcpus are created before KVM_CREATE_IRQCHIP, then -irqchip_in_kernel() and vcpu->arch.apic will be inconsistent, leading -to potential NULL pointer dereferences. - -Fix by: -- ensuring that no vcpus are installed when KVM_CREATE_IRQCHIP is called -- ensuring that a vcpu has an apic if it is installed after KVM_CREATE_IRQCHIP - -This is somewhat long winded because vcpu->arch.apic is created without -kvm->lock held. - -Based on earlier patch by Michael Ellerman. - -Signed-off-by: Michael Ellerman -Signed-off-by: Avi Kivity ---- - arch/ia64/kvm/kvm-ia64.c | 5 +++++ - arch/x86/kvm/x86.c | 8 ++++++++ - include/linux/kvm_host.h | 7 +++++++ - virt/kvm/kvm_main.c | 4 ++++ - 4 files changed, 24 insertions(+), 0 deletions(-) - -diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c -index d8ddbba..f5104b7 100644 ---- a/arch/ia64/kvm/kvm-ia64.c -+++ b/arch/ia64/kvm/kvm-ia64.c -@@ -1172,6 +1172,11 @@ out: - - #define PALE_RESET_ENTRY 0x80000000ffffffb0UL - -+bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu) -+{ -+ return irqchip_in_kernel(vcpu->kcm) == (vcpu->arch.apic != NULL); -+} -+ - int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) - { - struct kvm_vcpu *v; -diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c -index 3ee008f..be9594a 100644 ---- a/arch/x86/kvm/x86.c -+++ b/arch/x86/kvm/x86.c -@@ -3199,6 +3199,9 @@ long kvm_arch_vm_ioctl(struct file *filp, - r = -EEXIST; - if (kvm->arch.vpic) - goto create_irqchip_unlock; -+ r = -EINVAL; -+ if (atomic_read(&kvm->online_vcpus)) -+ goto create_irqchip_unlock; - r = -ENOMEM; - vpic = kvm_create_pic(kvm); - if (vpic) { -@@ -6107,6 +6110,11 @@ void kvm_arch_check_processor_compat(void *rtn) - kvm_x86_ops->check_processor_compatibility(rtn); - } - -+bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu) -+{ -+ return irqchip_in_kernel(vcpu->kvm) == (vcpu->arch.apic != NULL); -+} -+ - int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) - { - struct page *page; -diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h -index 355e445..759fa26 100644 ---- a/include/linux/kvm_host.h -+++ b/include/linux/kvm_host.h -@@ -805,6 +805,13 @@ static inline bool kvm_vcpu_is_bsp(struct kvm_vcpu *vcpu) - { - return vcpu->kvm->bsp_vcpu_id == vcpu->vcpu_id; - } -+ -+bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu); -+ -+#else -+ -+static bool kvm_vcpu_compatible(struct kvm_vcpu *vcpu) { return true; } -+ - #endif - - #ifdef __KVM_HAVE_DEVICE_ASSIGNMENT -diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c -index e4431ad..94e148e 100644 ---- a/virt/kvm/kvm_main.c -+++ b/virt/kvm/kvm_main.c -@@ -1651,6 +1651,10 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) - goto vcpu_destroy; - - mutex_lock(&kvm->lock); -+ if (!kvm_vcpu_compatible(vcpu)) { -+ r = -EINVAL; -+ goto unlock_vcpu_destroy; -+ } - if (atomic_read(&kvm->online_vcpus) == KVM_MAX_VCPUS) { - r = -EINVAL; - goto unlock_vcpu_destroy; --- -1.7.7.6 - diff --git a/config-generic b/config-generic index 9d2c334..072b025 100644 --- a/config-generic +++ b/config-generic @@ -352,6 +352,8 @@ CONFIG_BLK_DEV_FD=m # CONFIG_BLK_DEV_XD is not set # CONFIG_PARIDE is not set +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set + CONFIG_BLK_CPQ_DA=m CONFIG_BLK_CPQ_CISS_DA=m CONFIG_CISS_SCSI_TAPE=y diff --git a/kernel.spec b/kernel.spec index ef44121..bec326f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -42,7 +42,7 @@ Summary: The Linux kernel # When changing real_sublevel below, reset this by hand to 1 # (or to 0 and then use rpmdev-bumpspec). # -%global baserelease 2 +%global baserelease 1 %global fedora_build %{baserelease} # real_sublevel is the 3.x kernel version we're starting with @@ -51,7 +51,7 @@ Summary: The Linux kernel %define fake_sublevel %(echo $((40 + %{real_sublevel}))) # Do we have a -stable update to apply? -%define stable_update 5 +%define stable_update 6 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -676,9 +676,6 @@ Patch21232: rt2x00_fix_MCU_request_failures.patch #rhbz 789644 Patch21237: mcelog-rcu-splat.patch -#rhbz 728478 -Patch21242: sony-laptop-Enable-keyboard-backlight-by-default.patch - Patch21300: unhandled-irqs-switch-to-polling.patch #rhbz 804957 CVE-2012-1568 @@ -687,9 +684,6 @@ Patch21306: shlib_base_randomize.patch #rhbz 807632 Patch21385: libata-forbid-port-runtime-pm-by-default.patch -#rhbz 808207 CVE-2012-1601 -Patch21520: KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch - #rhbz 808559 Patch21530: ALSA-hda-realtek-Add-quirk-for-Mac-Pro-5-1-machines.patch @@ -1277,9 +1271,6 @@ ApplyPatch bcma-brcmsmac-compat.patch #rhbz 789644 ApplyPatch mcelog-rcu-splat.patch -#rhbz 728478 -ApplyPatch sony-laptop-Enable-keyboard-backlight-by-default.patch - #rhbz 804957 CVE-2012-1568 ApplyPatch shlib_base_randomize.patch @@ -1287,9 +1278,6 @@ ApplyPatch unhandled-irqs-switch-to-polling.patch ApplyPatch weird-root-dentry-name-debug.patch -#rhbz 808207 CVE-2012-1601 -ApplyPatch KVM-Ensure-all-vcpus-are-consistent-with-in-kernel-i.patch - #rhbz 807632 ApplyPatch libata-forbid-port-runtime-pm-by-default.patch @@ -1957,6 +1945,9 @@ fi # and build. %changelog +* Mon May 14 2012 Justin M. Forbes 2.6.43.6-1 +- Linux 3.3.6 + * Mon May 07 2012 Mauro Carvalho Chehab 2.6.43.5-2 - Add patch to fix DVB-S zigzag (rhbz 814404) diff --git a/sony-laptop-Enable-keyboard-backlight-by-default.patch b/sony-laptop-Enable-keyboard-backlight-by-default.patch deleted file mode 100644 index c993fd8..0000000 --- a/sony-laptop-Enable-keyboard-backlight-by-default.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0dbc2bc96b1ec741bdd43451c286ccd45da3310b Mon Sep 17 00:00:00 2001 -From: Josh Boyer -Date: Wed, 2 Nov 2011 14:31:59 -0400 -Subject: [PATCH] sony-laptop: Enable keyboard backlight by default - -When the keyboard backlight support was originally added, the commit said -to default it to on with a 10 second timeout. That actually wasn't the -case, as the default value is commented out for the kbd_backlight parameter. -Because it is a static variable, it gets set to 0 by default without some -other form of initialization. - -However, it seems the function to set the value wasn't actually called -immediately, so whatever state the keyboard was in initially would remain. -Then commit df410d522410e67660 was introduced during the 2.6.39 timeframe to -immediately set whatever value was present (as well as attempt to -restore/reset the state on module removal or resume). That seems to have -now forced the light off immediately when the module is loaded unless -the option kbd_backlight=1 is specified. - -Let's enable it by default again (for the first time). This should solve -https://bugzilla.redhat.com/show_bug.cgi?id=728478 - -Acked-by: Mattia Dongili -Signed-off-by: Josh Boyer ---- - drivers/platform/x86/sony-laptop.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c -index c006dee..40c4705 100644 ---- a/drivers/platform/x86/sony-laptop.c -+++ b/drivers/platform/x86/sony-laptop.c -@@ -127,7 +127,7 @@ MODULE_PARM_DESC(minor, - "default is -1 (automatic)"); - #endif - --static int kbd_backlight; /* = 1 */ -+static int kbd_backlight = 1; - module_param(kbd_backlight, int, 0444); - MODULE_PARM_DESC(kbd_backlight, - "set this to 0 to disable keyboard backlight, " --- -1.7.7.6 - diff --git a/sources b/sources index ae96167..755d90d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 7133f5a2086a7d7ef97abac610c094f5 linux-3.3.tar.xz -d346edca5d3de7052f49996b01cef401 patch-3.3.5.xz +a7f67e9c491403906e4bb475de194631 patch-3.3.6.xz