--- ../../kernels/linux-2.6.5/drivers/acpi/asus_acpi.c 2004-03-21 16:48:28.000000000 +0100 +++ ./asus_acpi.c 2004-03-24 12:09:51.000000000 +0100 @@ -40,6 +40,7 @@ #include #include #include +#include #define ASUS_ACPI_VERSION "0.27" @@ -494,14 +495,22 @@ read_led(struct asus_hotk *hotk, const c /* FIXME: kill extraneous args so it can be called independently */ static int -write_led(const char *buffer, unsigned long count, struct asus_hotk *hotk, +write_led(const char __user *buffer, unsigned long count, struct asus_hotk *hotk, char *ledname, int ledmask, int invert) { int value; int led_out = 0; + char *tmp_buffer; - if (sscanf(buffer, "%i", &value) == 1) + tmp_buffer = kmalloc(count + 1, GFP_KERNEL); + if (copy_from_user(tmp_buffer, buffer, count)) { + kfree(tmp_buffer); + return -EFAULT; + } else + tmp_buffer[count] = '\0'; + if (sscanf(tmp_buffer, "%i", &value) == 1) led_out = value ? 1 : 0; + kfree(tmp_buffer); hotk->status = (led_out) ? (hotk->status | ledmask) : (hotk->status & ~ledmask); @@ -651,14 +660,23 @@ proc_read_lcd(char *page, char **start, static int -proc_write_lcd(struct file *file, const char *buffer, +proc_write_lcd(struct file *file, const char __user *buffer, unsigned long count, void *data) { int value; struct asus_hotk *hotk = (struct asus_hotk *) data; + char *tmp_buffer; - if (sscanf(buffer, "%i", &value) == 1) + tmp_buffer = kmalloc(count + 1, GFP_KERNEL); + if (copy_from_user(tmp_buffer, buffer, count)) { + kfree(tmp_buffer); + return -EFAULT; + } else + tmp_buffer[count] = '\0'; + if (sscanf(tmp_buffer, "%i", &value) == 1) set_lcd_state(hotk, value); + kfree(tmp_buffer); + return count; } @@ -718,19 +736,27 @@ proc_read_brn(char *page, char **start, } static int -proc_write_brn(struct file *file, const char *buffer, +proc_write_brn(struct file *file, const char __user *buffer, unsigned long count, void *data) { int value; struct asus_hotk *hotk = (struct asus_hotk *) data; + char *tmp_buffer; - if (sscanf(buffer, "%d", &value) == 1) { + tmp_buffer = kmalloc(count + 1, GFP_KERNEL); + if (copy_from_user(tmp_buffer, buffer, count)) { + kfree(tmp_buffer); + return -EFAULT; + } else + tmp_buffer[count] = '\0'; + if (sscanf(tmp_buffer, "%d", &value) == 1) { value = (0 < value) ? ((15 < value) ? 15 : value) : 0; /* 0 <= value <= 15 */ set_brightness(value, hotk); } else { printk(KERN_WARNING "Asus ACPI: Error reading user input\n"); } + kfree(tmp_buffer); return count; } @@ -767,17 +793,25 @@ proc_read_disp(char *page, char **start, * simultaneously, so be warned. See the acpi4asus README for more info. */ static int -proc_write_disp(struct file *file, const char *buffer, +proc_write_disp(struct file *file, const char __user *buffer, unsigned long count, void *data) { int value; struct asus_hotk *hotk = (struct asus_hotk *) data; + char *tmp_buffer; - if (sscanf(buffer, "%d", &value) == 1) + tmp_buffer = kmalloc(count + 1, GFP_KERNEL); + if (copy_from_user(tmp_buffer, buffer, count)) { + kfree(tmp_buffer); + return -EFAULT; + } else + tmp_buffer[count] = '\0'; + if (sscanf(tmp_buffer, "%d", &value) == 1) set_display(value, hotk); else { printk(KERN_WARNING "Asus ACPI: Error reading user input\n"); } + kfree(tmp_buffer); return count; } @@ -1006,7 +1040,6 @@ static int __init asus_hotk_get_info(str } - static int __init asus_hotk_check(struct asus_hotk *hotk) { int result = 0; @@ -1029,7 +1062,6 @@ static int __init asus_hotk_check(struct } - static int __init asus_hotk_add(struct acpi_device *device) { struct asus_hotk *hotk = NULL;