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-02-01 05:06:27 +00:00
parent 248f93c76e
commit 2e63fd91b8
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/os/hpux/hpux_sigar.c
View File

@ -549,12 +549,6 @@ int sigar_file_system_list_get(sigar_t *sigar,
return SIGAR_OK; return SIGAR_OK;
} }
/* XXX this is exactly the same as linux and solaris is darn close */
#include <sys/vfs.h>
#define SIGAR_FS_BLOCKS_TO_BYTES(buf, f) \
(((sigar_uint64_t)buf.f * (buf.f_bsize / 512)) >> 1)
static int create_fsdev_cache(sigar_t *sigar) static int create_fsdev_cache(sigar_t *sigar)
{ {
sigar_file_system_list_t fslist; sigar_file_system_list_t fslist;
@ -593,20 +587,30 @@ int sigar_disk_usage_get(sigar_t *sigar, const char *name,
return SIGAR_ENOTIMPL; return SIGAR_ENOTIMPL;
} }
/* XXX this is exactly the same as linux and solaris is darn close */
#include <sys/vfs.h>
#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 statfs buf; struct statfs buf;
struct stat sb; struct stat sb;
sigar_uint64_t val, bsize;
if (statfs(dirname, &buf) != 0) { if (statfs(dirname, &buf) != 0) {
return errno; return errno;
} }
fsusage->total = SIGAR_FS_BLOCKS_TO_BYTES(buf, f_blocks); bsize = buf.f_bsize / 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;