Merge pull request #119 from MilhouseVH/fix-5.1-rc1

kernel-5.1-rc1 fix
This commit is contained in:
Carlos Garcés 2019-03-19 09:18:49 +01:00 committed by GitHub
commit 0a7199b457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1967,7 +1967,7 @@ static int isFileReadable(char *path)
ret = PTR_ERR(fp);
}
else {
oldfs = get_fs(); set_fs(get_ds());
oldfs = get_fs(); set_fs(KERNEL_DS);
if(1!=readFile(fp, &buf, 1))
ret = PTR_ERR(fp);
@ -1995,7 +1995,7 @@ static int retriveFromFile(char *path, u8* buf, u32 sz)
if( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
oldfs = get_fs(); set_fs(get_ds());
oldfs = get_fs(); set_fs(KERNEL_DS);
ret=readFile(fp, buf, sz);
set_fs(oldfs);
closeFile(fp);
@ -2029,7 +2029,7 @@ static int storeToFile(char *path, u8* buf, u32 sz)
if( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
oldfs = get_fs(); set_fs(get_ds());
oldfs = get_fs(); set_fs(KERNEL_DS);
ret=writeFile(fp, buf, sz);
set_fs(oldfs);
closeFile(fp);