Rewrite initialiser for proc_oom_adjust_operations,
and add __user annotations to oom_adjust_{read|write}
Signed-off-by: Ben Dooks <[EMAIL PROTECTED]>
diff -urN -X ../dontdiff linux-2.6.11-bk10/fs/proc/base.c
linux-2.6.11-bk10-procfs/fs/proc/base.c
--- linux-2.6.11-bk10/fs/proc/base.c 2005-03-14 14:45:00.000000000 +0000
+++ linux-2.6.11-bk10-procfs/fs/proc/base.c 2005-03-14 20:43:39.000000000
+0000
@@ -715,7 +715,7 @@
.open = mem_open,
};
-static ssize_t oom_adjust_read(struct file *file, char *buf,
+static ssize_t oom_adjust_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
struct task_struct *task = proc_task(file->f_dentry->d_inode);
@@ -735,7 +735,7 @@
return count;
}
-static ssize_t oom_adjust_write(struct file *file, const char *buf,
+static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
struct task_struct *task = proc_task(file->f_dentry->d_inode);
@@ -761,8 +761,8 @@
}
static struct file_operations proc_oom_adjust_operations = {
- read: oom_adjust_read,
- write: oom_adjust_write,
+ .read = oom_adjust_read,
+ .write = oom_adjust_write,
};
static struct inode_operations proc_mem_inode_operations = {
diff -urN -X ../dontdiff linux-2.6.11-bk10/fs/proc/base.c
linux-2.6.11-bk10-procfs/fs/proc/base.c
--- linux-2.6.11-bk10/fs/proc/base.c 2005-03-14 14:45:00.000000000 +0000
+++ linux-2.6.11-bk10-procfs/fs/proc/base.c 2005-03-14 20:43:39.000000000
+0000
@@ -715,7 +715,7 @@
.open = mem_open,
};
-static ssize_t oom_adjust_read(struct file *file, char *buf,
+static ssize_t oom_adjust_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
struct task_struct *task = proc_task(file->f_dentry->d_inode);
@@ -735,7 +735,7 @@
return count;
}
-static ssize_t oom_adjust_write(struct file *file, const char *buf,
+static ssize_t oom_adjust_write(struct file *file, const char __user *buf,
size_t count, loff_t *ppos)
{
struct task_struct *task = proc_task(file->f_dentry->d_inode);
@@ -761,8 +761,8 @@
}
static struct file_operations proc_oom_adjust_operations = {
- read: oom_adjust_read,
- write: oom_adjust_write,
+ .read = oom_adjust_read,
+ .write = oom_adjust_write,
};
static struct inode_operations proc_mem_inode_operations = {
