Skip to content

L
linux-davinci-2.6.23
Commit 6b2b4e5a authored by Al Viro's avatar Al Viro
Browse files
Options

[PATCH] compat_ioctl __user annotations 

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d6561010
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
fs/compat_ioctl.c
View file @ 6b2b4e5a
...@@ -931,8 +931,8 @@ struct compat_sg_req_info { /* used by SG_GET_REQUEST_TABLE ioctl() */ ...@@ -931,8 +931,8 @@ struct compat_sg_req_info { /* used by SG_GET_REQUEST_TABLE ioctl() */
static int sg_grt_trans(unsigned int fd, unsigned int cmd, unsigned long arg) static int sg_grt_trans(unsigned int fd, unsigned int cmd, unsigned long arg)
{ {
int err, i; int err, i;
sg_req_info_t *r; sg_req_info_t __user *r;
struct compat_sg_req_info *o = (struct compat_sg_req_info *)arg; struct compat_sg_req_info __user *o = (void __user *)arg;
r = compat_alloc_user_space(sizeof(sg_req_info_t)*SG_MAX_QUEUE); r = compat_alloc_user_space(sizeof(sg_req_info_t)*SG_MAX_QUEUE);
err = sys_ioctl(fd,cmd,(unsigned long)r); err = sys_ioctl(fd,cmd,(unsigned long)r);
if (err < 0) if (err < 0)
...@@ -2739,8 +2739,8 @@ static int do_ncp_setprivatedata(unsigned int fd, unsigned int cmd, unsigned lon ...@@ -2739,8 +2739,8 @@ static int do_ncp_setprivatedata(unsigned int fd, unsigned int cmd, unsigned lon
static int static int
lp_timeout_trans(unsigned int fd, unsigned int cmd, unsigned long arg) lp_timeout_trans(unsigned int fd, unsigned int cmd, unsigned long arg)
{ {
struct compat_timeval *tc = (struct compat_timeval *)arg; struct compat_timeval __user *tc = (struct compat_timeval __user *)arg;
struct timeval *tn = compat_alloc_user_space(sizeof(struct timeval)); struct timeval __user *tn = compat_alloc_user_space(sizeof(struct timeval));
struct timeval ts; struct timeval ts;
if (get_user(ts.tv_sec, &tc->tv_sec) || if (get_user(ts.tv_sec, &tc->tv_sec) ||
get_user(ts.tv_usec, &tc->tv_usec) || get_user(ts.tv_usec, &tc->tv_usec) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment