ab7fc8ee5b
- target/i386: Introduce SapphireRapids-v3 to add missing features - qtest/fuzz-lsi53c895a-test: set guest RAM to 2G - hw/net/lan9118: Signal TSFL_INT flag when TX FIFO reaches specified level - target/arm: Fix alignment for VLD4.32 - hw/microblaze: pass random seed to fdt - tests/qtest: npcm7xx-emc-test: Skip checking MAC - tests: mark io-command test as skipped if socat is missing - tests: unit: add NULL-pointer check - tests: test-qga: close socket on failure to connect - vdpa:block device capacity expansion online support vdpa block device update capacity. - virtio-net: Ensure queue index fits with RSS(CVE-2024-6505) - nbd/server: CVE-2024-7409: Avoid use-after-free when closing server - ppc/vof: Fix unaligned FDT property access - vvfat: Fix reading files with non-continuous clusters - vvfat: Fix bug in writing to middle of file - savevm: Fix load_snapshot error path crash - hw/dma/xilinx_axidma: Use semicolon at end of statement, not comma - hw/remote/message.c: Don't directly invoke DeviceClass:reset - crypto/tlscredspsk: Free username on finalize - hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read() - virtio: remove virtio_tswap16s() call in vring_packed_event_read() - char-stdio: Restore blocking mode of stdout on exit - hw/ppc: spapr: Use qemu_vfree() to free spapr->htab - smbios: sanitize type from external type before checking have_fields_bitmap - spapr_pci: fix leak in spapr_phb_vfio_get_loc_code - KVM: use store-release to mark dirty pages as harvested - monitor/hmp: print trace as option in help for log command - tpm_crb: Avoid backend startup just before shutdown under Xen - crypto/block-luks: make range overlap check more readable - spapr: Free stdout path - target/rx: Use target_ulong for address in LI - virtio-pci: Fix the use of an uninitialized irqfd - rtl8139: Fix behaviour for old kernels. - virtio-rng: block max-bytes=0 MIME-Version: 1.0 - hw/audio/es1370: Clean up comment - vhost-user-server: do not set memory fd non-blocking - ui: reject extended clipboard message if not activated - virtio-net: Fix vhost virtqueue notifiers for RSS - hw/misc/applesmc: Fix memory leak in reset() handler Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit db7a5d9a7239db307c8c1454fab5f8a92fd486b8)
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From ca6f8348075be1839e87fa826a2719127ec64d41 Mon Sep 17 00:00:00 2001
|
|
From: dinglimin <dinglimin@cmss.chinamobile.com>
|
|
Date: Mon, 2 Sep 2024 17:40:40 +0800
|
|
Subject: [PATCH] crypto/block-luks: make range overlap check more readable
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cheery-pick from 7cd9b9d476e729808f3c9b82a12f51a39673d5cb
|
|
|
|
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>
|
|
Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.com>
|
|
---
|
|
crypto/block-luks.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/crypto/block-luks.c b/crypto/block-luks.c
|
|
index fe8f04ffb2..2648719337 100644
|
|
--- a/crypto/block-luks.c
|
|
+++ b/crypto/block-luks.c
|
|
@@ -33,6 +33,7 @@
|
|
|
|
#include "qemu/coroutine.h"
|
|
#include "qemu/bitmap.h"
|
|
+#include "qemu/range.h"
|
|
|
|
/*
|
|
* Reference for the LUKS format implemented here is
|
|
@@ -591,7 +592,7 @@ qcrypto_block_luks_check_header(const QCryptoBlockLUKS *luks, Error **errp)
|
|
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);
|
|
--
|
|
2.41.0.windows.1
|
|
|