diff options
| author | Roman Smirnov <r.smirnov@omp.ru> | 2024-03-05 16:45:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-13 12:50:16 +0200 |
| commit | 6a55dab4ac956deb23690eedd74e70b892a378e7 (patch) | |
| tree | 4b150b460496e33b1da58d85e338c51d1ff2bc2a | |
| parent | 56199ebbcbbcc36658c2212b854b37dff8419e52 (diff) | |
| download | linux-stable-6a55dab4ac956deb23690eedd74e70b892a378e7.tar.gz linux-stable-6a55dab4ac956deb23690eedd74e70b892a378e7.tar.bz2 linux-stable-6a55dab4ac956deb23690eedd74e70b892a378e7.zip | |
block: prevent division by zero in blk_rq_stat_sum()
[ Upstream commit 93f52fbeaf4b676b21acfe42a5152620e6770d02 ]
The expression dst->nr_samples + src->nr_samples may
have zero value on overflow. It is necessary to add
a check to avoid division by zero.
Found by Linux Verification Center (linuxtesting.org) with Svace.
Signed-off-by: Roman Smirnov <r.smirnov@omp.ru>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/20240305134509.23108-1-r.smirnov@omp.ru
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | block/blk-stat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-stat.c b/block/blk-stat.c index 7587b1c3caaf..507ac714423b 100644 --- a/block/blk-stat.c +++ b/block/blk-stat.c @@ -27,7 +27,7 @@ void blk_rq_stat_init(struct blk_rq_stat *stat) /* src is a per-cpu stat, mean isn't initialized */ void blk_rq_stat_sum(struct blk_rq_stat *dst, struct blk_rq_stat *src) { - if (!src->nr_samples) + if (dst->nr_samples + src->nr_samples <= dst->nr_samples) return; dst->min = min(dst->min, src->min); |