]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: avoid overflowing f_bfree
authorLuis de Bethencourt <luisbg@osg.samsung.com>
Wed, 30 Mar 2016 22:18:14 +0000 (23:18 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Jun 2016 01:18:54 +0000 (18:18 -0700)
commit 41b34accb265e3a20211a7a8ef3625678f1c6ec7 upstream.

Since mixed block groups accounting isn't byte-accurate and f_bree is an
unsigned integer, it could overflow. Avoid this.

Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Suggested-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/super.c

index 4e6f842b5ad2e82d174e4e236042733e8c5f7fc8..468e988d8110e91815c3bf39559f28cd4dcb99f0 100644 (file)
@@ -2073,7 +2073,11 @@ static int btrfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 
        /* Account global block reserve as used, it's in logical size already */
        spin_lock(&block_rsv->lock);
-       buf->f_bfree -= block_rsv->size >> bits;
+       /* Mixed block groups accounting is not byte-accurate, avoid overflow */
+       if (buf->f_bfree >= block_rsv->size >> bits)
+               buf->f_bfree -= block_rsv->size >> bits;
+       else
+               buf->f_bfree = 0;
        spin_unlock(&block_rsv->lock);
 
        buf->f_bavail = div_u64(total_free_data, factor);