diff options
| author | Jeremy Allison <jra@samba.org> | 2004-07-30 00:19:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:16 -0500 |
| commit | 23d157a0bea16366f0361ab68193b479ed844291 (patch) | |
| tree | 47796775b988b4a43af5f48d9884f79bdd464b17 /source/lib/fsusage.c | |
| parent | 2063b8d9bcf0b2ad9f09d71b5c74ad3db070c6a3 (diff) | |
| download | samba-23d157a0bea16366f0361ab68193b479ed844291.tar.gz samba-23d157a0bea16366f0361ab68193b479ed844291.tar.xz samba-23d157a0bea16366f0361ab68193b479ed844291.zip | |
r1608: Fix from Nick THOMPSON <nickthompson@agere.com> to protect smbd
against broken filesystems which return zero blocksize.
Jeremy.
Diffstat (limited to 'source/lib/fsusage.c')
| -rw-r--r-- | source/lib/fsusage.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/lib/fsusage.c b/source/lib/fsusage.c index bb7cff06453..036f276319f 100644 --- a/source/lib/fsusage.c +++ b/source/lib/fsusage.c @@ -26,12 +26,17 @@ */ static SMB_BIG_UINT adjust_blocks(SMB_BIG_UINT blocks, SMB_BIG_UINT fromsize, SMB_BIG_UINT tosize) { - if (fromsize == tosize) /* e.g., from 512 to 512 */ + if (fromsize == tosize) { /* e.g., from 512 to 512 */ return blocks; - else if (fromsize > tosize) /* e.g., from 2048 to 512 */ + } else if (fromsize > tosize) { /* e.g., from 2048 to 512 */ return blocks * (fromsize / tosize); - else /* e.g., from 256 to 512 */ + } else { /* e.g., from 256 to 512 */ + /* Protect against broken filesystems... */ + if (fromsize == 0) { + fromsize = tosize; + } return (blocks + 1) / (tosize / fromsize); + } } /* this does all of the system specific guff to get the free disk space. |