diff options
| author |   Pavel Emelyanov <xemul@openvz.org> | 2008-04-25 01:49:48 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-04-25 01:49:48 -0700 |
| commit | 653252c2302cdf2dfbca66a7e177f7db783f9efa (patch) | |
| tree | 8d77bebbe29378c818313e4557242548b923d787 /net/dccp/probe.c | |
| parent | Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 (diff) | |
| download | linux-dev-653252c2302cdf2dfbca66a7e177f7db783f9efa.tar.xz linux-dev-653252c2302cdf2dfbca66a7e177f7db783f9efa.zip | |
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: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/probe.c')
| -rw-r--r-- | net/dccp/probe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c index 6e1df62bd7c9..0bcdc9250279 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -140,7 +140,7 @@ static ssize_t dccpprobe_read(struct file *file, char __user *buf, goto out_free; 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: vfree(tbuf); |