mirror of https://github.com/xemu-project/xemu.git
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>
This commit is contained in:
parent
13c59a0e9e
commit
7cd9b9d476
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue