Commit 653252c2 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

net: Fix wrong interpretation of some copy_to_user() results.

I found some places, that erroneously return the value obtained from
the copy_to_user() call: if some amount of bytes were not able to get
to the user (this is what this one returns) the proper behavior is to
return the -EFAULT error, not that number itself.
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cc93d7d7
...@@ -573,7 +573,8 @@ static int raw_getsockopt(struct socket *sock, int level, int optname, ...@@ -573,7 +573,8 @@ static int raw_getsockopt(struct socket *sock, int level, int optname,
int fsize = ro->count * sizeof(struct can_filter); int fsize = ro->count * sizeof(struct can_filter);
if (len > fsize) if (len > fsize)
len = fsize; len = fsize;
err = copy_to_user(optval, ro->filter, len); if (copy_to_user(optval, ro->filter, len))
err = -EFAULT;
} else } else
len = 0; len = 0;
release_sock(sk); release_sock(sk);
......
...@@ -140,7 +140,7 @@ static ssize_t dccpprobe_read(struct file *file, char __user *buf, ...@@ -140,7 +140,7 @@ static ssize_t dccpprobe_read(struct file *file, char __user *buf,
goto out_free; goto out_free;
cnt = kfifo_get(dccpw.fifo, tbuf, len); cnt = kfifo_get(dccpw.fifo, tbuf, len);
error = copy_to_user(buf, tbuf, cnt); error = copy_to_user(buf, tbuf, cnt) ? -EFAULT : 0;
out_free: out_free:
vfree(tbuf); vfree(tbuf);
......
...@@ -1756,8 +1756,8 @@ static int getsockopt(struct socket *sock, ...@@ -1756,8 +1756,8 @@ static int getsockopt(struct socket *sock,
else if (len < sizeof(value)) { else if (len < sizeof(value)) {
res = -EINVAL; res = -EINVAL;
} }
else if ((res = copy_to_user(ov, &value, sizeof(value)))) { else if (copy_to_user(ov, &value, sizeof(value))) {
/* couldn't return value */ res = -EFAULT;
} }
else { else {
res = put_user(sizeof(value), ol); res = put_user(sizeof(value), ol);
......
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