[kernel] r17405 - in dists/lenny/linux-2.6/debian: . patches/bugfix/x86 patches/series

[Dann Frazier]

Author: dannf
Date: Mon May 16 00:57:14 2011
New Revision: 17405

Log:
[x86] asus_acpi: world-writable procfs files

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/x86/asus_acpi-world-writeable-procfs-files.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/27

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	Mon May 16 00:57:05 2011	(r17404)
+++ dists/lenny/linux-2.6/debian/changelog	Mon May 16 00:57:14 2011	(r17405)
@@ -15,6 +15,7 @@
     - [x86] mm: avoid possible bogus tlb entries by clearing prev mm_cpumask
       after switching mm
     - dm raid1: fail writes if errors are not handled and log fails
+    - [x86] asus_acpi: world-writable procfs files
 
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 29 Nov 2010 02:01:24 +0000
 

Added: dists/lenny/linux-2.6/debian/patches/bugfix/x86/asus_acpi-world-writeable-procfs-files.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/x86/asus_acpi-world-writeable-procfs-files.patch	Mon May 16 00:57:14 2011	(r17405)
@@ -0,0 +1,36 @@
+commit ad2696852ffe240fbe4d88cbfd9e1ee890cff7aa
+Author: Vasiliy Kulikov <segoon at openwall.com>
+Date:   Fri Feb 4 15:23:59 2011 +0300
+
+    platform: x86: asus_acpi: world-writable procfs files
+    
+    commit 8040835760adf0ef66876c063d47f79f015fb55d upstream.
+    
+    Don't allow everybody to change ACPI settings.  The comment says that it
+    is done deliberatelly, however, the comment before disp_proc_write()
+    says that at least one of these setting is experimental.
+    
+    Signed-off-by: Vasiliy Kulikov <segoon at openwall.com>
+    Signed-off-by: Matthew Garrett <mjg at redhat.com>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+diff --git a/drivers/acpi/asus_acpi.c b/drivers/acpi/asus_acpi.c
+index e2ab023..0037320 100644
+--- a/drivers/acpi/asus_acpi.c
++++ b/drivers/acpi/asus_acpi.c
+@@ -985,14 +985,8 @@ static int asus_hotk_add_fs(struct acpi_device *device)
+ 	struct proc_dir_entry *proc;
+ 	mode_t mode;
+ 
+-	/*
+-	 * If parameter uid or gid is not changed, keep the default setting for
+-	 * our proc entries (-rw-rw-rw-) else, it means we care about security,
+-	 * and then set to -rw-rw----
+-	 */
+-
+ 	if ((asus_uid == 0) && (asus_gid == 0)) {
+-		mode = S_IFREG | S_IRUGO | S_IWUGO;
++		mode = S_IFREG | S_IRUGO | S_IWUSR | S_IWGRP;
+ 	} else {
+ 		mode = S_IFREG | S_IRUSR | S_IRGRP | S_IWUSR | S_IWGRP;
+ 		printk(KERN_WARNING "  asus_uid and asus_gid parameters are "

Modified: dists/lenny/linux-2.6/debian/patches/series/27
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/27	Mon May 16 00:57:05 2011	(r17404)
+++ dists/lenny/linux-2.6/debian/patches/series/27	Mon May 16 00:57:14 2011	(r17405)
@@ -6,3 +6,4 @@
 + bugfix/all/ptrace-use-safer-wake-up-on-ptrace_detach.patch
 + bugfix/x86/mm-avoid-possible-bogus-tlb-entries-by-clearing-prev-mm_cpumask-after.patch
 + bugfix/all/dm-raid1-fail-writes-if-errors-are-not-handled-and-log-fails.patch
++ bugfix/x86/asus_acpi-world-writeable-procfs-files.patch