lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cx25821: sanitize cx25821_openfile_audio() a bit...

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2013-04-13 16:48:24 -04:00
parent 2ce8fce2ea
commit 3af0761307
1 changed files with 32 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
drivers/media/pci/cx25821/cx25821-audio-upstream.c
View File

@@ -321,81 +321,41 @@ static void cx25821_audioups_handler(struct work_struct *work)
static int cx25821_openfile_audio(struct cx25821_dev *dev, static int cx25821_openfile_audio(struct cx25821_dev *dev,
struct sram_channel *sram_ch) struct sram_channel *sram_ch)
{ {
struct file *myfile; char *p = (void *)dev->_audiodata_buf_virt_addr;
int i = 0, j = 0; struct file *file;
int line_size = AUDIO_LINE_SIZE; loff_t offset;
ssize_t vfs_read_retval = 0; int i, j;
char mybuf[line_size];
loff_t pos;
loff_t offset = (unsigned long)0;
mm_segment_t old_fs;
myfile = filp_open(dev->_audiofilename, O_RDONLY | O_LARGEFILE, 0); file = filp_open(dev->_audiofilename, O_RDONLY | O_LARGEFILE, 0);
if (IS_ERR(file)) {
if (IS_ERR(myfile)) { pr_err("%s(): ERROR opening file(%s) with errno = %ld!\n",
const int open_errno = -PTR_ERR(myfile); __func__, dev->_audiofilename, PTR_ERR(file));
pr_err("%s(): ERROR opening file(%s) with errno = %d!\n", return PTR_ERR(file);
__func__, dev->_audiofilename, open_errno);
return PTR_ERR(myfile);
} else {
if (!(myfile->f_op)) {
pr_err("%s(): File has no file operations registered!\n",
__func__);
filp_close(myfile, NULL);
return -EIO;
} }
if (!myfile->f_op->read) { for (j = 0, offset = 0; j < NUM_AUDIO_FRAMES; j++) {
pr_err("%s(): File has no READ operations registered!\n",
__func__);
filp_close(myfile, NULL);
return -EIO;
}
pos = myfile->f_pos;
old_fs = get_fs();
set_fs(KERNEL_DS);
for (j = 0; j < NUM_AUDIO_FRAMES; j++) {
for (i = 0; i < dev->_audio_lines_count; i++) { for (i = 0; i < dev->_audio_lines_count; i++) {
pos = offset; char buf[AUDIO_LINE_SIZE];
int n = kernel_read(file, offset, buf,
AUDIO_LINE_SIZE);
vfs_read_retval = vfs_read(myfile, mybuf, if (n < AUDIO_LINE_SIZE) {
line_size, &pos);
if (vfs_read_retval > 0 &&
vfs_read_retval == line_size &&
dev->_audiodata_buf_virt_addr != NULL) {
memcpy((void *)(dev->
_audiodata_buf_virt_addr
+ offset / 4), mybuf,
vfs_read_retval);
}
offset += vfs_read_retval;
if (vfs_read_retval < line_size) {
pr_info("Done: exit %s() since no more bytes to read from Audio file\n", pr_info("Done: exit %s() since no more bytes to read from Audio file\n",
__func__); __func__);
break; dev->_audiofile_status = END_OF_FILE;
} fput(file);
return 0;
} }
if (i > 0) if (p)
memcpy(p + offset, buf, n);
offset += n;
}
dev->_audioframe_count++; dev->_audioframe_count++;
if (vfs_read_retval < line_size)
break;
} }
dev->_audiofile_status = IN_PROGRESS;
dev->_audiofile_status = (vfs_read_retval == line_size) ? fput(file);
IN_PROGRESS : END_OF_FILE;
set_fs(old_fs);
myfile->f_pos = 0;
filp_close(myfile, NULL);
}
return 0; return 0;
} }