]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
bcache: Use 64-bit arithmetic instead of 32-bit
authorGustavo A. R. Silva <gustavoars@kernel.org>
Sun, 11 Apr 2021 13:43:15 +0000 (21:43 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 14 May 2021 08:52:40 +0000 (10:52 +0200)
[ Upstream commit 62594f189e81caffa6a3bfa2fdb08eec2e347c76 ]

Cast multiple variables to (int64_t) in order to give the compiler
complete information about the proper arithmetic to use. Notice that
these variables are being used in contexts that expect expressions of
type int64_t  (64 bit, signed). And currently, such expressions are
being evaluated using 32-bit arithmetic.

Fixes: d0cf9503e908 ("octeontx2-pf: ethtool fec mode support")
Addresses-Coverity-ID: 1501724 ("Unintentional integer overflow")
Addresses-Coverity-ID: 1501725 ("Unintentional integer overflow")
Addresses-Coverity-ID: 1501726 ("Unintentional integer overflow")
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Coly Li <colyli@suse.de>
Link: https://lore.kernel.org/r/20210411134316.80274-7-colyli@suse.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/md/bcache/writeback.c

index 82d4e0880a994e9afac2c55b1de8738b4458a229..4fb635c0baa07ca45375c9c2eea1ab230404c503 100644 (file)
@@ -110,13 +110,13 @@ static void __update_writeback_rate(struct cached_dev *dc)
                int64_t fps;
 
                if (c->gc_stats.in_use <= BCH_WRITEBACK_FRAGMENT_THRESHOLD_MID) {
-                       fp_term = dc->writeback_rate_fp_term_low *
+                       fp_term = (int64_t)dc->writeback_rate_fp_term_low *
                        (c->gc_stats.in_use - BCH_WRITEBACK_FRAGMENT_THRESHOLD_LOW);
                } else if (c->gc_stats.in_use <= BCH_WRITEBACK_FRAGMENT_THRESHOLD_HIGH) {
-                       fp_term = dc->writeback_rate_fp_term_mid *
+                       fp_term = (int64_t)dc->writeback_rate_fp_term_mid *
                        (c->gc_stats.in_use - BCH_WRITEBACK_FRAGMENT_THRESHOLD_MID);
                } else {
-                       fp_term = dc->writeback_rate_fp_term_high *
+                       fp_term = (int64_t)dc->writeback_rate_fp_term_high *
                        (c->gc_stats.in_use - BCH_WRITEBACK_FRAGMENT_THRESHOLD_HIGH);
                }
                fps = div_s64(dirty, dirty_buckets) * fp_term;