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

vt6656: slightly sanitized reading config

Browse Source 
Just reading - parsing the results is left alone (and unspeakably
lousy).

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2013-04-06 18:00:07 -04:00
parent 434b5a2e2d
commit 7c51d177f0
1 changed files with 20 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
drivers/staging/vt6656/main_usb.c
View File

@@ -46,6 +46,7 @@
*/ */
#undef __NO_VERSION__ #undef __NO_VERSION__
#include <linux/file.h>
#include "device.h" #include "device.h"
#include "card.h" #include "card.h"
#include "baseband.h" #include "baseband.h"
@@ -1316,53 +1317,29 @@ static int Config_FileGetParameter(unsigned char *string,
/* if read fails, return NULL, or return data pointer */ /* if read fails, return NULL, or return data pointer */
static unsigned char *Config_FileOperation(struct vnt_private *pDevice) static unsigned char *Config_FileOperation(struct vnt_private *pDevice)
{ {
unsigned char *config_path = CONFIG_PATH; unsigned char *buffer = kmalloc(1024, GFP_KERNEL);
unsigned char *buffer = NULL; struct file *file;
struct file *filp=NULL;
mm_segment_t old_fs = get_fs();
int result = 0; if (!buffer) {
printk("allocate mem for file fail?\n");
return NULL;
}
set_fs (KERNEL_DS); file = filp_open(CONFIG_PATH, O_RDONLY, 0);
if (IS_ERR(file)) {
kfree(buffer);
printk("Config_FileOperation file Not exist\n");
return NULL;
}
/* open file */ if (kernel_read(file, 0, buffer, 1024) < 0) {
filp = filp_open(config_path, O_RDWR, 0); printk("read file error?\n");
if (IS_ERR(filp)) { kfree(buffer);
printk("Config_FileOperation file Not exist\n"); buffer = NULL;
result=-1; }
goto error2;
}
if(!(filp->f_op) || !(filp->f_op->read) ||!(filp->f_op->write)) { fput(file);
printk("file %s is not read or writeable?\n",config_path); return buffer;
result = -1;
goto error1;
}
buffer = kmalloc(1024, GFP_KERNEL);
if(buffer==NULL) {
printk("allocate mem for file fail?\n");
result = -1;
goto error1;
}
if(filp->f_op->read(filp, buffer, 1024, &filp->f_pos)<0) {
printk("read file error?\n");
result = -1;
}
error1:
if(filp_close(filp,NULL))
printk("Config_FileOperation:close file fail\n");
error2:
set_fs (old_fs);
if(result!=0) {
kfree(buffer);
buffer=NULL;
}
return buffer;
} }
/* return --->-1:fail; >=0:successful */ /* return --->-1:fail; >=0:successful */