leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] lirc_zilog: error out if buffer read bytes != chunk size

Browse Source 
Give it a few tries, then exit. Prevents a possible endless loop
situation.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jarod Wilson 2011-03-04 19:53:05 -03:00 committed by Mauro Carvalho Chehab
parent 55734785cd
commit cc664ae026
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/lirc/lirc_zilog.c
View File

@ -897,7 +897,7 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
struct IR *ir = filep->private_data; struct IR *ir = filep->private_data;
struct IR_rx *rx; struct IR_rx *rx;
struct lirc_buffer *rbuf = ir->l.rbuf; struct lirc_buffer *rbuf = ir->l.rbuf;
int ret = 0, written = 0; int ret = 0, written = 0, retries = 0;
unsigned int m; unsigned int m;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
@ -950,6 +950,12 @@ static ssize_t read(struct file *filep, char *outbuf, size_t n, loff_t *ppos)
ret = copy_to_user((void *)outbuf+written, buf, ret = copy_to_user((void *)outbuf+written, buf,
rbuf->chunk_size); rbuf->chunk_size);
written += rbuf->chunk_size; written += rbuf->chunk_size;
} else {
retries++;
}
if (retries >= 5) {
zilog_error("Buffer read failed!\n");
ret = -EIO;
} }
} }
} }