rpms/kernel/F-12 vgaarb-fix-userspace-ptr-deref.patch, NONE, 1.1 kernel.spec, 1.2010, 1.2011

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Added Files:
	vgaarb-fix-userspace-ptr-deref.patch 
Log Message:
* Tue Feb 16 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.8-51
- vgaarb-fix-userspace-ptr-deref.patch: fix a userspace ptr deref.
  (rhbz#564246) [and correct upstream diff]


vgaarb-fix-userspace-ptr-deref.patch:
 vgaarb.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE vgaarb-fix-userspace-ptr-deref.patch ---
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index 1ac0c93..2f6cf69 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
 		remaining -= 7;
 		pr_devel("client 0x%p called 'target'\n", priv);
 		/* if target is default */
-		if (!strncmp(buf, "default", 7))
+		if (!strncmp(curr_pos, "default", 7))
 			pdev = pci_dev_get(vga_default_device());
 		else {
 			if (!vga_pci_str_to_vars(curr_pos, remaining,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.2010
retrieving revision 1.2011
diff -u -p -r1.2010 -r1.2011
--- kernel.spec	16 Feb 2010 19:11:07 -0000	1.2010
+++ kernel.spec	16 Feb 2010 21:55:41 -0000	1.2011
@@ -763,6 +763,7 @@ Patch12311: fix-ima-null-ptr-deref.patch
 Patch12312: futex-handle-user-space-corruption-gracefully.patch
 
 Patch12313: fix-abrtd.patch
+Patch12314: vgaarb-fix-userspace-ptr-deref.patch
 
 # ==============================================================================
 
@@ -1402,6 +1403,7 @@ ApplyPatch fix-ima-null-ptr-deref.patch
 ApplyPatch futex-handle-user-space-corruption-gracefully.patch
 
 ApplyPatch fix-abrtd.patch
+ApplyPatch vgaarb-fix-userspace-ptr-deref.patch
 
 # END OF PATCH APPLICATIONS ====================================================
 
@@ -2058,6 +2060,10 @@ fi
 # and build.
 
 %changelog
+* Tue Feb 16 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.8-51
+- vgaarb-fix-userspace-ptr-deref.patch: fix a userspace ptr deref.
+  (rhbz#564246) [and correct upstream diff]
+
 * Tue Feb 16 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.8-50
 - fix-abrtd.patch: backport of nhorman's call_usermode_helper changes
   from devel/ & linux-next.