bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[SIGAR-85] Fix possible integer overflow in sigar_file_system_usage

This commit is contained in:
Doug MacEachern 2008-01-31 20:43:01 +00:00
parent efb74c1703
commit 073b439b2a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/os/solaris/solaris_sigar.c
View File

@ -1358,9 +1358,6 @@ int sigar_file_system_list_get(sigar_t *sigar,
#include <sys/statvfs.h> #include <sys/statvfs.h>
#define SIGAR_FS_BLOCKS_TO_BYTES(buf, f) \
(((sigar_uint64_t)buf.f * (buf.f_frsize / 512)) >> 1)
typedef struct { typedef struct {
char device[PATH_MAX]; char device[PATH_MAX];
char name[8]; char name[8];
@ -1722,19 +1719,26 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
return status; return status;
} }
#define SIGAR_FS_BLOCKS_TO_BYTES(val, bsize) ((val * bsize) >> 1)
int sigar_file_system_usage_get(sigar_t *sigar, int sigar_file_system_usage_get(sigar_t *sigar,
const char *dirname, const char *dirname,
sigar_file_system_usage_t *fsusage) sigar_file_system_usage_t *fsusage)
{ {
struct statvfs buf; struct statvfs buf;
sigar_uint64_t val, bsize;
if (statvfs(dirname, &buf) != 0) { if (statvfs(dirname, &buf) != 0) {
return errno; return errno;
} }
fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_blocks); bsize = buf.f_frsize / 512;
fsusage->free = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bfree); val = buf.f_blocks;
fsusage->avail = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_bavail); fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(val, bsize);
val = buf.f_bfree;
fsusage->free = SIGAR_FS_BLOCKS_TO_BYTES(val, bsize);
val = buf.f_bavail;
fsusage->avail = SIGAR_FS_BLOCKS_TO_BYTES(val, bsize);
fsusage->used = fsusage->total - fsusage->free; fsusage->used = fsusage->total - fsusage->free;
fsusage->files = buf.f_files; fsusage->files = buf.f_files;
fsusage->free_files = buf.f_ffree; fsusage->free_files = buf.f_ffree;