From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 9 Jun 2017 20:42:34 +0000 (+0300)
Subject: quota-fs: Make sure quota calculations don't overflow in old systems
X-Git-Tag: 2.3.0.rc1~1451
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15c365ef8fadf433160deb3f59442616ed0569dc;p=thirdparty%2Fdovecot%2Fcore.git

quota-fs: Make sure quota calculations don't overflow in old systems

Patch by M. Balridge
---

diff --git a/src/plugins/quota/quota-fs.c b/src/plugins/quota/quota-fs.c
index cfabc9a315..333172d84c 100644
--- a/src/plugins/quota/quota-fs.c
+++ b/src/plugins/quota/quota-fs.c
@@ -590,10 +590,10 @@ fs_quota_get_linux(struct fs_quota_root *root, bool group,
 		}
 
 		/* values always returned in 512 byte blocks */
-		*bytes_value_r = xdqblk.d_bcount * 512;
-		*bytes_limit_r = xdqblk.d_blk_softlimit * 512;
+		*bytes_value_r = xdqblk.d_bcount * 512ULL;
+		*bytes_limit_r = xdqblk.d_blk_softlimit * 512ULL;
 		if (*bytes_limit_r == 0) {
-			*bytes_limit_r = xdqblk.d_blk_hardlimit * 512;
+			*bytes_limit_r = xdqblk.d_blk_hardlimit * 512ULL;
 		}
 		*count_value_r = xdqblk.d_icount;
 		*count_limit_r = xdqblk.d_ino_softlimit;
@@ -624,13 +624,13 @@ fs_quota_get_linux(struct fs_quota_root *root, bool group,
 		}
 
 #if _LINUX_QUOTA_VERSION == 1
-		*bytes_value_r = dqblk.dqb_curblocks * 1024;
+		*bytes_value_r = dqblk.dqb_curblocks * 1024ULL;
 #else
 		*bytes_value_r = dqblk.dqb_curblocks;
 #endif
-		*bytes_limit_r = dqblk.dqb_bsoftlimit * 1024;
+		*bytes_limit_r = dqblk.dqb_bsoftlimit * 1024ULL;
 		if (*bytes_limit_r == 0) {
-			*bytes_limit_r = dqblk.dqb_bhardlimit * 1024;
+			*bytes_limit_r = dqblk.dqb_bhardlimit * 1024ULL;
 		}
 		*count_value_r = dqblk.dqb_curinodes;
 		*count_limit_r = dqblk.dqb_isoftlimit;