r1028 - in trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian: . patches

[Simon Horman]

Author: horms
Date: 2004-08-11 21:58:21 -0600 (Wed, 11 Aug 2004)
New Revision: 1028

Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
Log:
Reversed bogus patch to parse_arg introduced as part of the fix to
    CAN-2004-0495 in 2.4.26-3 (closes: Bug#264202)


Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-12 03:52:59 UTC (rev 1027)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/changelog	2004-08-12 03:58:21 UTC (rev 1028)
@@ -73,8 +73,11 @@
     . net/atm/br2684.c
     . net/atm/mpoa_proc.c
     . net/wanrouter/wanproc.c
+  * Reversed bogus patch to parse_arg introduced as part of the fix to
+    CAN-2004-0495 in 2.4.26-3 (closes: Bug#264202)
+    . drivers/acpi/asus_acpi.c
 
- -- Simon Horman <horms@debian.org>  Thu, 12 Aug 2004 12:51:09 +0900
+ -- Simon Horman <horms@debian.org>  Thu, 12 Aug 2004 12:53:46 +0900
 
 kernel-source-2.4.26 (2.4.26-5) unstable; urgency=high
 

Modified: trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-12 03:52:59 UTC (rev 1027)
+++ trunk/kernel-2.4/source/kernel-source-2.4.26-2.4.26/debian/patches/patch-2.4.26-6	2004-08-12 03:58:21 UTC (rev 1028)
@@ -4757,3 +4757,15 @@
 #   Fix net/atm/br2684.c file offset patch
 # *** Incorporated into patch for ChangeSet 1.1465 above - Horms 2004/08/12 ***
 # 
+--- drivers/acpi/asus_acpi.c.orig	2004-08-12 12:39:49.000000000 +0900
++++ drivers/acpi/asus_acpi.c	2004-08-12 10:21:11.000000000 +0900
+@@ -403,7 +403,8 @@
+ 	if (copy_from_user(s, buf, count))
+ 		return -EFAULT;
+ 	s[count] = 0;
+-	if (sscanf(s, "%i", val) != 1)
++	count = parse_arg(buffer, count, &value);
++	if (count > 0)
+ 		return -EINVAL;
+ 	return count;
+ }