rpms/kernel/devel linux-2.6-fix-kvm-2.6.25-rc6-leak.patch, NONE, 1.1 kernel.spec, 1.527, 1.528

[Kyle McMartin (kyle)]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16186

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-fix-kvm-2.6.25-rc6-leak.patch 
Log Message:
* Mon Mar 24 2008 Kyle McMartin <kmcmartin at redhat.com>
- Add fix-kvm-2.6.25-rc6-leak.patch, requested by jkatz.


linux-2.6-fix-kvm-2.6.25-rc6-leak.patch:

--- NEW FILE linux-2.6-fix-kvm-2.6.25-rc6-leak.patch ---
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 4ba85d9..e55af12 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -1412,7 +1412,7 @@ static void mmu_guess_page_from_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,
 	up_read(&current->mm->mmap_sem);
 
 	vcpu->arch.update_pte.gfn = gfn;
-	vcpu->arch.update_pte.page = gfn_to_page(vcpu->kvm, gfn);
+	vcpu->arch.update_pte.page = page;
 }
 
 void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.527
retrieving revision 1.528
diff -u -r1.527 -r1.528
--- kernel.spec	23 Mar 2008 21:30:40 -0000	1.527
+++ kernel.spec	24 Mar 2008 16:25:07 -0000	1.528
@@ -640,6 +640,7 @@
 Patch2400: linux-2.6-uvcvideo.patch
 
 Patch2501: linux-2.6-ppc-use-libgcc.patch
+Patch2502: linux-2.6-fix-kvm-2.6.25-rc6-leak.patch
 
 %endif
 
@@ -1136,6 +1137,7 @@
 ApplyPatch linux-2.6-uvcvideo.patch
 
 ApplyPatch linux-2.6-ppc-use-libgcc.patch
+ApplyPatch linux-2.6-fix-kvm-2.6.25-rc6-leak.patch
 
 # ---------- below all scheduled for 2.6.24 -----------------
 
@@ -1732,6 +1734,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Mon Mar 24 2008 Kyle McMartin <kmcmartin at redhat.com>
+- Add fix-kvm-2.6.25-rc6-leak.patch, requested by jkatz.
+
 * Sun Mar 23 2008 Tom "spot" Callaway <tcallawa at redhat.com>
 - fix selinux mprotect for sparc