From: Luke Kosewski <lkosewsk@nit.ca>
Date: Wed, 1 Jun 2005 07:39:28 +0000 (-0500)
Subject: Input: do not corrupt system-wide procfs fops.
X-Git-Tag: v2.6.13-rc1~51^2~43^2~9
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e334016fc1735e491385e14157a0360cd85c321b;p=linux-2.6-omap-h63xx.git

Input: do not corrupt system-wide procfs fops.

entry->proc_fops is a pointer to struct file_operations. When we
call create_proc_entry(...), it pointis to proc_file_operations,
deep in fs/proc/generic.c. By adding a 'poll' member to this struct
we effectively force the 'poll' member on every file in /proc,
which is wrong (they all fail select(...) calls).

This patch changes a copy of entry->proc_fops and reassigns it rather
than changing the original member.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

diff --git a/drivers/input/input.c b/drivers/input/input.c
index 1885f369e3e..c1dbc04cf54 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -697,6 +697,8 @@ static int input_handlers_read(char *buf, char **start, off_t pos, int count, in
 	return (count > cnt) ? cnt : count;
 }
 
+static struct file_operations input_fileops;
+
 static int __init input_proc_init(void)
 {
 	struct proc_dir_entry *entry;
@@ -711,6 +713,8 @@ static int __init input_proc_init(void)
 		return -ENOMEM;
 	}
 	entry->owner = THIS_MODULE;
+	input_fileops = *entry->proc_fops;
+	entry->proc_fops = &input_fileops;
 	entry->proc_fops->poll = input_devices_poll;
 	entry = create_proc_read_entry("handlers", 0, proc_bus_input_dir, input_handlers_read, NULL);
 	if (entry == NULL) {