[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/5] migration: Define BLK_MIG_BLOCK_SIZE as unsigned long long
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 4/5] migration: Define BLK_MIG_BLOCK_SIZE as unsigned long long |
Date: |
Tue, 2 Aug 2022 16:54:46 +0100 |
From: Peter Maydell <peter.maydell@linaro.org>
When we use BLK_MIG_BLOCK_SIZE in expressions like
block_mig_state.submitted * BLK_MIG_BLOCK_SIZE, this multiplication
is done as 32 bits, because both operands are 32 bits. Coverity
complains about possible overflows because we then accumulate that
into a 64 bit variable.
Define BLK_MIG_BLOCK_SIZE as unsigned long long using the ULL suffix.
The only two current uses of it with this problem are both in
block_save_pending(), so we could just cast to uint64_t there, but
using the ULL suffix is simpler and ensures that we don't
accidentally introduce new variants of the same issue in future.
Resolves: Coverity CID 1487136, 1487175
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220721115207.729615-3-peter.maydell@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/block.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/migration/block.c b/migration/block.c
index 9e5aae5898..3577c815a9 100644
--- a/migration/block.c
+++ b/migration/block.c
@@ -28,7 +28,7 @@
#include "sysemu/block-backend.h"
#include "trace.h"
-#define BLK_MIG_BLOCK_SIZE (1 << 20)
+#define BLK_MIG_BLOCK_SIZE (1ULL << 20)
#define BDRV_SECTORS_PER_DIRTY_CHUNK (BLK_MIG_BLOCK_SIZE >> BDRV_SECTOR_BITS)
#define BLK_MIG_FLAG_DEVICE_BLOCK 0x01
--
2.37.1
- [PULL 0/5] migration queue, Dr. David Alan Gilbert (git), 2022/08/02
- [PULL 1/5] migration: add remaining params->has_* = true in migration_instance_init(), Dr. David Alan Gilbert (git), 2022/08/02
- [PULL 2/5] Revert "migration: Simplify unqueue_page()", Dr. David Alan Gilbert (git), 2022/08/02
- [PULL 3/5] migration: Assert that migrate_multifd_compression() returns an in-range value, Dr. David Alan Gilbert (git), 2022/08/02
- [PULL 4/5] migration: Define BLK_MIG_BLOCK_SIZE as unsigned long long,
Dr. David Alan Gilbert (git) <=
- [PULL 5/5] virtiofsd: Disable killpriv_v2 by default, Dr. David Alan Gilbert (git), 2022/08/02
- Re: [PULL 0/5] migration queue, Richard Henderson, 2022/08/02