Skip to content

Commit

Permalink
V4L/DVB: dvb_ca_en50221: return -EFAULT on copy_to_user errors
Browse files Browse the repository at this point in the history
copy_to_user() returns the number of bytes remaining to be copied which
isn't the right thing to return here.  The comments say that these
functions in dvb_ca_en50221.c should return the number of bytes copied or
an error return.  I've changed it to return -EFAULT.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Dan Carpenter authored and Mauro Carvalho Chehab committed Aug 2, 2010
1 parent aac870a commit e252984
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/media/dvb/dvb-core/dvb_ca_en50221.c
Original file line number Diff line number Diff line change
Expand Up @@ -1318,8 +1318,11 @@ static ssize_t dvb_ca_en50221_io_write(struct file *file,

fragbuf[0] = connection_id;
fragbuf[1] = ((fragpos + fraglen) < count) ? 0x80 : 0x00;
if ((status = copy_from_user(fragbuf + 2, buf + fragpos, fraglen)) != 0)
status = copy_from_user(fragbuf + 2, buf + fragpos, fraglen);
if (status) {
status = -EFAULT;
goto exit;
}

timeout = jiffies + HZ / 2;
written = 0;
Expand Down Expand Up @@ -1494,8 +1497,11 @@ static ssize_t dvb_ca_en50221_io_read(struct file *file, char __user * buf,

hdr[0] = slot;
hdr[1] = connection_id;
if ((status = copy_to_user(buf, hdr, 2)) != 0)
status = copy_to_user(buf, hdr, 2);
if (status) {
status = -EFAULT;
goto exit;
}
status = pktlen;

exit:
Expand Down

0 comments on commit e252984

Please sign in to comment.