From: Brian Norris <computersforpeace@gmail.com>
To: Chris Mason <clm@fb.com>
Cc: Josef Bacik <jbacik@fb.com>,
linux-btrfs@vger.kernel.org,
Linux Kernel <linux-kernel@vger.kernel.org>,
Brian Norris <computersforpeace@gmail.com>
Subject: [PATCH] fs: btrfs: fix potential overflow
Date: Sat, 23 Aug 2014 22:41:21 -0700 [thread overview]
Message-ID: <1408858881-30497-1-git-send-email-computersforpeace@gmail.com> (raw)
It looks like this intended to be 64-bit arithmetic, but it's actually
performed as 32-bit. Fix that. (Note that 'increment' was being
initialized twice, so this patch removes one of those.)
Caught by Coverity Scan (CID 1201422).
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
---
Untested
fs/btrfs/scrub.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index b6d198f5181e..b1a8127737b4 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -2320,26 +2320,26 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
do_div(nstripes, map->stripe_len);
if (map->type & BTRFS_BLOCK_GROUP_RAID0) {
offset = map->stripe_len * num;
- increment = map->stripe_len * map->num_stripes;
+ increment *= map->num_stripes;
mirror_num = 1;
} else if (map->type & BTRFS_BLOCK_GROUP_RAID10) {
int factor = map->num_stripes / map->sub_stripes;
offset = map->stripe_len * (num / map->sub_stripes);
- increment = map->stripe_len * factor;
+ increment *= factor;
mirror_num = num % map->sub_stripes + 1;
} else if (map->type & BTRFS_BLOCK_GROUP_RAID1) {
- increment = map->stripe_len;
+ increment *= 1;
mirror_num = num % map->num_stripes + 1;
} else if (map->type & BTRFS_BLOCK_GROUP_DUP) {
- increment = map->stripe_len;
+ increment *= 1;
mirror_num = num % map->num_stripes + 1;
} else if (map->type & (BTRFS_BLOCK_GROUP_RAID5 |
BTRFS_BLOCK_GROUP_RAID6)) {
get_raid56_logic_offset(physical, num, map, &offset);
- increment = map->stripe_len * nr_data_stripes(map);
+ increment *= nr_data_stripes(map);
mirror_num = 1;
} else {
- increment = map->stripe_len;
+ increment *= 1;
mirror_num = 1;
}
--
1.7.9.5
next reply other threads:[~2014-08-24 5:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-24 5:41 Brian Norris [this message]
2014-08-24 9:44 ` [PATCH] fs: btrfs: fix potential overflow Timofey Titovets
2014-08-26 6:45 ` Brian Norris
2014-08-26 6:47 ` [PATCH v2] " Brian Norris
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=1408858881-30497-1-git-send-email-computersforpeace@gmail.com \
--to=computersforpeace@gmail.com \
--cc=clm@fb.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