Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e252984c authored by Dan Carpenter's avatar Dan Carpenter Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: dvb_ca_en50221: return -EFAULT on copy_to_user errors 



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: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent aac870a8

drivers/media/dvb/dvb-core/dvb_ca_en50221.c

+8 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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: