github-mirror/mergerfs
2
0
Fork 0
mirror of https://github.com/trapexit/mergerfs.git synced 2024-11-22 11:02:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fuse_lowlevel.c

Browse Source
This commit is contained in:
Antonio SJ Musumeci 2024-02-09 07:43:26 -06:00
parent facdb66746
commit c4b8701d65
2 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libfuse/lib/fuse.c
View File

@ -177,6 +177,19 @@ static pthread_key_t fuse_context_key;
static pthread_mutex_t fuse_context_lock = PTHREAD_MUTEX_INITIALIZER;
static int fuse_context_ref;
static
int
fuse_valid_type(uint32_t const m_)
{
return (S_ISREG(m_) ||
S_ISDIR(m_) ||
S_ISLNK(m_) ||
S_ISCHR(m_) ||
S_ISBLK(m_) ||
S_ISFIFO(m_) ||
S_ISSOCK(m_));
}
/*
Why was the nodeid:generation logic simplified?
@ -1696,6 +1709,13 @@ fuse_lib_getattr(fuse_req_t req,
free_path(f,hdr_->nodeid,path);
}
if(buf.st_size > LLONG_MAX)
syslog(LOG_ERR,"%s: %zu size > LLONG_MAX %zu",__FUNCTION__,hdr_->nodeid,buf.st_size);
if(!fuse_valid_type(buf.st_mode))
syslog(LOG_ERR,"%s: %zu invalid type %x",__FUNCTION__,hdr_->nodeid,buf.st_mode);
if(hdr_->nodeid == FUSE_ROOT_ID && !S_ISDIR(buf.st_mode))
syslog(LOG_ERR,"%s: rootid not type DIR %x",__FUNCTION__,buf.st_mode);
if(!err)
{
pthread_mutex_lock(&f->lock);
@ -1817,6 +1837,14 @@ fuse_lib_setattr(fuse_req_t req,
f->fs->op.getattr(path,&stbuf,&timeout) :
f->fs->op.fgetattr(fi,&stbuf,&timeout));
if(stbuf.st_size > LLONG_MAX)
syslog(LOG_ERR,"%s: %zu size > LLONG_MAX %zu",__FUNCTION__,hdr_->nodeid,stbuf.st_size);
if(!fuse_valid_type(stbuf.st_mode))
syslog(LOG_ERR,"%s: %zu invalid type %x",__FUNCTION__,hdr_->nodeid,stbuf.st_mode);
if(hdr_->nodeid == FUSE_ROOT_ID && !S_ISDIR(stbuf.st_mode))
syslog(LOG_ERR,"%s: rootid not type DIR %x",__FUNCTION__,stbuf.st_mode);
free_path(f,hdr_->nodeid,path);
}

29
libfuse/lib/fuse_lowlevel.c
View File

@ -19,15 +19,16 @@
#include "fuse_pollhandle.h"
#include "fuse_msgbuf.hpp"
#include <assert.h>
#include <errno.h>
#include <limits.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
#include <string.h>
#include <unistd.h>
#include <limits.h>
#include <errno.h>
#include <assert.h>
#include <sys/file.h>
#include <syslog.h>
#include <unistd.h>
#ifndef F_LINUX_SPECIFIC_BASE
#define F_LINUX_SPECIFIC_BASE 1024
@ -320,6 +321,19 @@ fuse_reply_create(fuse_req_t req,
return send_reply_ok(req, &buf, entrysize + sizeof(struct fuse_open_out));
}
static
int
fuse_valid_type(uint32_t const m_)
{
return (S_ISREG(m_) ||
S_ISDIR(m_) ||
S_ISLNK(m_) ||
S_ISCHR(m_) ||
S_ISBLK(m_) ||
S_ISFIFO(m_) ||
S_ISSOCK(m_));
}
int
fuse_reply_attr(fuse_req_t req,
const struct stat *attr,
@ -333,6 +347,11 @@ fuse_reply_attr(fuse_req_t req,
arg.attr_valid_nsec = 0;
convert_stat(attr,&arg.attr);
if(arg.attr.size > LLONG_MAX)
syslog(LOG_ERR,"fuse_reply_attr: attr.size > LLONG_MAX");
if(!fuse_valid_type(arg.attr.mode))
syslog(LOG_ERR,"fuse_reply_attr: invalid type %x",arg.attr.mode);
return send_reply_ok(req,&arg,size);
}