Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 347f217cec74dc6b5a9b8e77c4b15f5a6879ec1a

Authored by Al Viro
Committed by Linus Torvalds
1 parent 4d338e1acc
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[PATCH] uml: __user annotations 

__user annotations (hppfs)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 7 additions and 7 deletions Side-by-side Diff

fs/hppfs/hppfs_kern.c
Diff comments   View file @ 347f217
... ... @@ -216,10 +216,10 @@
216 216 static struct inode_operations hppfs_file_iops = {
217 217 };
218 218  
219   -static ssize_t read_proc(struct file *file, char *buf, ssize_t count,
  219 +static ssize_t read_proc(struct file *file, char __user *buf, ssize_t count,
220 220 loff_t *ppos, int is_user)
221 221 {
222   - ssize_t (*read)(struct file *, char *, size_t, loff_t *);
  222 + ssize_t (*read)(struct file *, char __user *, size_t, loff_t *);
223 223 ssize_t n;
224 224  
225 225 read = file->f_dentry->d_inode->i_fop->read;
... ... @@ -236,7 +236,7 @@
236 236 return n;
237 237 }
238 238  
239   -static ssize_t hppfs_read_file(int fd, char *buf, ssize_t count)
  239 +static ssize_t hppfs_read_file(int fd, char __user *buf, ssize_t count)
240 240 {
241 241 ssize_t n;
242 242 int cur, err;
... ... @@ -274,7 +274,7 @@
274 274 return n;
275 275 }
276 276  
277   -static ssize_t hppfs_read(struct file *file, char *buf, size_t count,
  277 +static ssize_t hppfs_read(struct file *file, char __user *buf, size_t count,
278 278 loff_t *ppos)
279 279 {
280 280 struct hppfs_private *hppfs = file->private_data;
281 281  
... ... @@ -313,12 +313,12 @@
313 313 return(count);
314 314 }
315 315  
316   -static ssize_t hppfs_write(struct file *file, const char *buf, size_t len,
  316 +static ssize_t hppfs_write(struct file *file, const char __user *buf, size_t len,
317 317 loff_t *ppos)
318 318 {
319 319 struct hppfs_private *data = file->private_data;
320 320 struct file *proc_file = data->proc_file;
321   - ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
  321 + ssize_t (*write)(struct file *, const char __user *, size_t, loff_t *);
322 322 int err;
323 323  
324 324 write = proc_file->f_dentry->d_inode->i_fop->write;
... ... @@ -658,7 +658,7 @@
658 658 .statfs = hppfs_statfs,
659 659 };
660 660  
661   -static int hppfs_readlink(struct dentry *dentry, char *buffer, int buflen)
  661 +static int hppfs_readlink(struct dentry *dentry, char __user *buffer, int buflen)
662 662 {
663 663 struct file *proc_file;
664 664 struct dentry *proc_dentry;