From: Luis de Bethencourt <luisbg@osg.samsung.com>
To: linux-kernel@vger.kernel.org
Cc: clm@fb.com, jbacik@fb.com, dsterba@suse.com,
linux-btrfs@vger.kernel.org,
Luis de Bethencourt <luisbg@osg.samsung.com>
Subject: [PATCH 2/2] btrfs: avoid overflowing f_bfree
Date: Wed, 30 Mar 2016 21:53:39 +0100 [thread overview]
Message-ID: <1459371219-1815-2-git-send-email-luisbg@osg.samsung.com> (raw)
In-Reply-To: <1459371219-1815-1-git-send-email-luisbg@osg.samsung.com>
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>
---
fs/btrfs/super.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index bdca79c..93376d0 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -2101,6 +2101,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);
--
2.5.3
next prev parent reply other threads:[~2016-03-30 20:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 20:53 [PATCH 1/2] btrfs: fix mixed block count of available space Luis de Bethencourt
2016-03-30 20:53 ` Luis de Bethencourt [this message]
2016-03-30 21:48 ` [PATCH 2/2] btrfs: avoid overflowing f_bfree Filipe Manana
2016-03-30 22:10 ` Luis de Bethencourt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459371219-1815-2-git-send-email-luisbg@osg.samsung.com \
--to=luisbg@osg.samsung.com \
--cc=clm@fb.com \
--cc=dsterba@suse.com \
--cc=jbacik@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®