octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-02-03 02:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

close FdEntity to avoid leakage

Browse Source
This commit is contained in:
yongqingliu 2020-09-07 20:48:16 +08:00
parent b5ffd419d8
commit 986fab8738
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/s3fs.cpp
View File

@ -1601,10 +1601,12 @@ static int s3fs_chmod(const char* _path, mode_t mode)
// allow to put header // allow to put header
// updatemeta already merged the orgmeta of the opened files. // updatemeta already merged the orgmeta of the opened files.
if(0 != put_headers(strpath.c_str(), updatemeta, true)){ if(0 != put_headers(strpath.c_str(), updatemeta, true)){
FdManager::get()->Close(ent);
return -EIO; return -EIO;
} }
StatCache::getStatCacheData()->DelStat(nowcache); StatCache::getStatCacheData()->DelStat(nowcache);
} }
FdManager::get()->Close(ent);
}else{ }else{
// not opened file, then put headers // not opened file, then put headers
merge_headers(meta, updatemeta, true); merge_headers(meta, updatemeta, true);
@ -1778,10 +1780,12 @@ static int s3fs_chown(const char* _path, uid_t uid, gid_t gid)
// allow to put header // allow to put header
// updatemeta already merged the orgmeta of the opened files. // updatemeta already merged the orgmeta of the opened files.
if(0 != put_headers(strpath.c_str(), updatemeta, true)){ if(0 != put_headers(strpath.c_str(), updatemeta, true)){
FdManager::get()->Close(ent);
return -EIO; return -EIO;
} }
StatCache::getStatCacheData()->DelStat(nowcache); StatCache::getStatCacheData()->DelStat(nowcache);
} }
FdManager::get()->Close(ent);
}else{ }else{
// not opened file, then put headers // not opened file, then put headers
merge_headers(meta, updatemeta, true); merge_headers(meta, updatemeta, true);
@ -1957,10 +1961,12 @@ static int s3fs_utimens(const char* _path, const struct timespec ts[2])
// allow to put header // allow to put header
// updatemeta already merged the orgmeta of the opened files. // updatemeta already merged the orgmeta of the opened files.
if(0 != put_headers(strpath.c_str(), updatemeta, true)){ if(0 != put_headers(strpath.c_str(), updatemeta, true)){
FdManager::get()->Close(ent);
return -EIO; return -EIO;
} }
StatCache::getStatCacheData()->DelStat(nowcache); StatCache::getStatCacheData()->DelStat(nowcache);
} }
FdManager::get()->Close(ent);
}else{ }else{
// not opened file, then put headers // not opened file, then put headers
merge_headers(meta, updatemeta, true); merge_headers(meta, updatemeta, true);
@ -2910,6 +2916,7 @@ static int s3fs_setxattr(const char* path, const char* name, const char* value,
ent->SetXattr(strxattr); ent->SetXattr(strxattr);
} }
if(0 != (result = set_xattrs_to_header(updatemeta, name, value, size, flags))){ if(0 != (result = set_xattrs_to_header(updatemeta, name, value, size, flags))){
FdManager::get()->Close(ent);
return result; return result;
} }
@ -2921,11 +2928,12 @@ static int s3fs_setxattr(const char* path, const char* name, const char* value,
// allow to put header // allow to put header
// updatemeta already merged the orgmeta of the opened files. // updatemeta already merged the orgmeta of the opened files.
if(0 != put_headers(strpath.c_str(), updatemeta, true)){ if(0 != put_headers(strpath.c_str(), updatemeta, true)){
FdManager::get()->Close(ent);
return -EIO; return -EIO;
} }
StatCache::getStatCacheData()->DelStat(nowcache); StatCache::getStatCacheData()->DelStat(nowcache);
} }
FdManager::get()->Close(ent);
}else{ }else{
// not opened file, then put headers // not opened file, then put headers
merge_headers(meta, updatemeta, true); merge_headers(meta, updatemeta, true);
@ -3199,11 +3207,12 @@ static int s3fs_removexattr(const char* path, const char* name)
updatemeta.erase("x-amz-meta-xattr"); updatemeta.erase("x-amz-meta-xattr");
} }
if(0 != put_headers(strpath.c_str(), updatemeta, true)){ if(0 != put_headers(strpath.c_str(), updatemeta, true)){
FdManager::get()->Close(ent);
return -EIO; return -EIO;
} }
StatCache::getStatCacheData()->DelStat(nowcache); StatCache::getStatCacheData()->DelStat(nowcache);
} }
FdManager::get()->Close(ent);
}else{ }else{
// not opened file, then put headers // not opened file, then put headers
if(updatemeta["x-amz-meta-xattr"].empty()){ if(updatemeta["x-amz-meta-xattr"].empty()){