From: Jeremy Allison <jra@samba.org>
Date: Fri, 30 Jul 2004 00:19:41 +0000 (+0000)
Subject: r1608: Fix from Nick THOMPSON <nickthompson@agere.com> to protect smbd
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5946
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=23d157a0bea16366f0361ab68193b479ed844291;p=thirdparty%2Fsamba.git

r1608: Fix from Nick THOMPSON <nickthompson@agere.com> to protect smbd
against broken filesystems which return zero blocksize.
Jeremy.
---

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.