diff options
| author | Yao Xingtao <yaoxt.fnst@fujitsu.com> | 2024-07-22 00:07:40 -0400 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-07-23 20:30:36 +0200 |
| commit | 7cd9b9d476e729808f3c9b82a12f51a39673d5cb (patch) | |
| tree | 2d20dc5a4799cbbf897cae9d49c7643142454cc1 | |
| parent | 13c59a0e9efad5154ff4aba46d5d645c99af8fcf (diff) | |
| download | qemu-7cd9b9d476e729808f3c9b82a12f51a39673d5cb.zip qemu-7cd9b9d476e729808f3c9b82a12f51a39673d5cb.tar.gz qemu-7cd9b9d476e729808f3c9b82a12f51a39673d5cb.tar.bz2 | |
crypto/block-luks: make range overlap check more readable
use ranges_overlap() instead of open-coding the overlap check to improve
the readability of the code.
Signed-off-by: Yao Xingtao <yaoxt.fnst@fujitsu.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20240722040742.11513-12-yaoxt.fnst@fujitsu.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
| -rw-r--r-- | crypto/block-luks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 5b777c1..45347ad 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -33,6 +33,7 @@ #include "qemu/uuid.h" #include "qemu/bitmap.h" +#include "qemu/range.h" /* * Reference for the LUKS format implemented here is @@ -572,7 +573,7 @@ qcrypto_block_luks_check_header(const QCryptoBlockLUKS *luks, header_sectors, slot2->stripes); - if (start1 + len1 > start2 && start2 + len2 > start1) { + if (ranges_overlap(start1, len1, start2, len2)) { error_setg(errp, "Keyslots %zu and %zu are overlapping in the header", i, j); |