[kernel] r15263 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Tue Feb 23 11:25:51 2010
New Revision: 15263

Log:
add vgaarb followon patch

previous wasn't complete.

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-target-default-passing.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Feb 23 04:57:37 2010	(r15262)
+++ dists/sid/linux-2.6/debian/changelog	Tue Feb 23 11:25:51 2010	(r15263)
@@ -29,6 +29,7 @@
   * vgaarb: fix incorrect dereference of userspace pointer.
   * Bump ABI to 3.
   * drm/i915: give up on 8xx lid status.
+  * vgaarb: fix "target=default" passing.
 
   [ Bastian Blank ]
   * Restrict access to sensitive SysRq keys by default.

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-target-default-passing.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/vgaarb-fix-target-default-passing.patch	Tue Feb 23 11:25:51 2010	(r15263)
@@ -0,0 +1,33 @@
+From 2cc9116c2b37c525965d76a3e6def38913259427 Mon Sep 17 00:00:00 2001
+From: Kyle McMartin <kyle at redhat.com>
+Date: Tue, 16 Feb 2010 16:18:37 -0500
+Subject: [PATCH] vgaarb: fix "target=default" passing
+
+Commit 77c1ff3982c6b36961725dd19e872a1c07df7f3b fixed the userspace
+pointer dereference, but introduced another bug pointed out by Eugene Teo
+in RH bug #564264. Instead of comparing the point we were at in the string,
+we instead compared the beginning of the string to "default".
+
+Signed-off-by: Kyle McMartin <kyle at redhat.com>
+Reported-by: Eugene Teo <eteo at redhat.com>
+Signed-off-by: Dave Airlie <airlied at redhat.com>
+---
+ drivers/gpu/vga/vgaarb.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
+index 24b56dc..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(kbuf, "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,
+-- 
+1.6.6.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	Tue Feb 23 04:57:37 2010	(r15262)
+++ dists/sid/linux-2.6/debian/patches/series/9	Tue Feb 23 11:25:51 2010	(r15263)
@@ -21,3 +21,4 @@
 + bugfix/all/drm-i915-give-up-on-8xx-lid-status.patch
 + features/arm/openrd-base-uart.patch
 + features/arm/dns323-rev-a1-powerled.patch
++ bugfix/all/vgaarb-fix-target-default-passing.patch