rpms/kernel/F-10 kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch, NONE, 1.1.2.1 linux-2.6-netdev-atl2-2.0.5-update.patch, NONE, 1.1.2.1 kernel.spec, 1.1206.2.61, 1.1206.2.62

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv834

Modified Files:
      Tag: private-fedora-10-2_6_27
	kernel.spec 
Added Files:
      Tag: private-fedora-10-2_6_27
	kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch 
	linux-2.6-netdev-atl2-2.0.5-update.patch 
Log Message:
Add patches from Fedora 9:
  Update the atl2 network driver to version 2.0.5
  KVM: don't allow access to the EFER from 32-bit x86 guests

kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch:

--- NEW FILE kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch ---
>From stable-bounces at linux.kernel.org  Thu Mar 26 23:05:08 2009
Date: Thu, 26 Mar 2009 23:05:03 GMT
From: Avi Kivity <avi at redhat.com>
Message-Id: <200903262305.n2QN53AB005694 at hera.kernel.org>
To: stable at kernel.org
Subject: KVM: VMX: Don't allow uninhibited access to EFER on i386

From: Avi Kivity <avi at redhat.com>

upstream commit: 16175a796d061833aacfbd9672235f2d2725df65

vmx_set_msr() does not allow i386 guests to touch EFER, but they can still
do so through the default: label in the switch.  If they set EFER_LME, they
can oops the host.

Fix by having EFER access through the normal channel (which will check for
EFER_LME) even on i386.

Reported-and-tested-by: Benjamin Gilbert <bgilbert at cs.cmu.edu>
Cc: stable at kernel.org
Signed-off-by: Avi Kivity <avi at redhat.com>
Signed-off-by: Chris Wright <chrisw at sous-sol.org>
---
 arch/x86/kvm/vmx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -928,11 +928,11 @@ static int vmx_set_msr(struct kvm_vcpu *
 	int ret = 0;
 
 	switch (msr_index) {
-#ifdef CONFIG_X86_64
 	case MSR_EFER:
 		vmx_load_host_state(vmx);
 		ret = kvm_set_msr_common(vcpu, msr_index, data);
 		break;
+#ifdef CONFIG_X86_64
 	case MSR_FS_BASE:
 		vmcs_writel(GUEST_FS_BASE, data);
 		break;

linux-2.6-netdev-atl2-2.0.5-update.patch:

--- NEW FILE linux-2.6-netdev-atl2-2.0.5-update.patch ---
--- a/drivers/net/atl2/atl2_main.c
+++ b/drivers/net/atl2/atl2_main.c
@@ -48,7 +48,7 @@
 
 #include "atl2.h"
 
-#define ATL2_DRV_VERSION "2.0.4"
+#define ATL2_DRV_VERSION "2.0.5"
 
 char atl2_driver_name[] = "atl2";
 static const char atl2_driver_string[] = "Atheros(R) L2 Ethernet Driver";
@@ -918,7 +918,8 @@
 	txs_unused = TxsFreeUnit(adapter);
 	txbuf_unused = TxdFreeBytes(adapter);
 
-	if (txs_unused < 1 || skb->len > txbuf_unused) {
+	if (skb->len + sizeof(tx_pkt_header_t) + 4  > txbuf_unused ||
+		txs_unused < 1 ) {
 		// no enough resource
 		netif_stop_queue(netdev);
 		spin_unlock_irqrestore(&adapter->tx_lock, flags);


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1206.2.61
retrieving revision 1.1206.2.62
diff -u -p -r1.1206.2.61 -r1.1206.2.62
--- kernel.spec	20 May 2009 21:41:16 -0000	1.1206.2.61
+++ kernel.spec	20 May 2009 21:49:21 -0000	1.1206.2.62
@@ -706,6 +706,7 @@ Patch2014: linux-2.6-toshiba-acpi-only-r
 
 # atl2 network driver
 Patch2020: linux-2.6-netdev-atl2.patch
+Patch2021: linux-2.6-netdev-atl2-2.0.5-update.patch
 
 # Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
 Patch2030: linux-2.6-net-tulip-interrupt.patch
@@ -776,6 +777,8 @@ Patch3130: disable-p4-cpufreq-ui.patch
 # Fix up the v4l2 video_open function
 Patch3140: linux-2.6.27-fix-video_open.patch
 
+Patch4000: kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1345,6 +1348,7 @@ ApplyPatch linux-2.6-toshiba-acpi-only-r
 
 # atl2 network driver
 ApplyPatch linux-2.6-netdev-atl2.patch
+ApplyPatch linux-2.6-netdev-atl2-2.0.5-update.patch
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
@@ -1400,6 +1404,8 @@ ApplyPatch disable-p4-cpufreq-ui.patch
 
 ApplyPatch linux-2.6.27-fix-video_open.patch
 
+ApplyPatch kvm-vmx-don-t-allow-uninhibited-access-to-efer-on-i386.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1975,6 +1981,11 @@ fi
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Wed Apr 20 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.24-170.2.62
+- Add patches from Fedora 9:
+  Update the atl2 network driver to version 2.0.5
+  KVM: don't allow access to the EFER from 32-bit x86 guests
+
 * Wed Apr 20 2009 Chuck Ebbert <cebbert at redhat.com>  2.6.27.24-170.2.61
 - Linux 2.6.27.24
 - Fix up execshield, utrace, r8169 and drm patches for .24