mirror of
https://github.com/trapexit/mergerfs.git
synced 2026-10-26 19:01:56 -04:00
fuse_readdir: atomic initialized flag; bound error string; check msgbuf allocation
- ReadDir::_initialized is set by the first thread through the lazy-init path and read by every subsequent caller; make it std::atomic<bool> so the read/write pair has a happens-before relationship. - The 'no valid mergerfs branch found' error directory entry used strcpy into a fixed-size dirent buffer. The message happens to fit today but the buffer is only NAME_MAX wide; switch to a length-bounded strncpy driven by the constexpr string size. - The getdents implementations for seq/cor/cosr allocated a msgbuf without checking for allocation failure and then dereferenced it. Return -ENOMEM when the allocation fails.
This commit is contained in:
parent
f5d9a60b9d
commit
cf38a37176
5 changed files with 14 additions and 3 deletions
|
|
@ -90,15 +90,18 @@ _handle_ENOENT(const fuse_file_info_t *ffi_,
|
|||
if(!di->fusepath.empty())
|
||||
return -ENOENT;
|
||||
|
||||
constexpr const char msg[] =
|
||||
"error: no valid mergerfs branch found, check config";
|
||||
|
||||
de = {};
|
||||
|
||||
de.d_ino = 0;
|
||||
de.d_off = 0;
|
||||
de.d_type = DT_UNKNOWN;
|
||||
strcpy(de.d_name,"error: no valid mergerfs branch found, check config");
|
||||
strncpy(de.d_name,msg,(sizeof(msg) - 1));
|
||||
de.d_reclen = sizeof(de);
|
||||
|
||||
fuse_dirents_add(buf_,&de,::strlen(de.d_name));
|
||||
fuse_dirents_add(buf_,&de,(sizeof(msg) - 1));
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue