6ee9ba5898
* Changelog from Linbit:
9.1.23 (api:genl2/proto:86-101,118-121/transport:18)
--------
* Fix a corner case that can happen when DRBD establishes multiple
connections in parallel, which could lead one connection to end up in
an inconsistent replication state of WFBitMapT/Established
* Fix a corner case in which a reconciliation resync ends up in
WFBitMapT/Established
* Restrict protocol compatibility to the most recent 8.4 and 9.0 releases
* Fix a corner case causing a module ref leak on drbd_transport_tcp;
if it hits, you can not rmmod it
* rate-limit resync progress while resync is paused
* resync-target inherits history UUIDs when resync finishes,
this can prevent unexpected "unrelared data" events later
* Updated compatibility code for Linux 6.11 and 6.12
* remove patches which already included in the new version:
0001-drbd-properly-rate-limit-resync-progress-reports.patch
0002-drbd-inherit-history-UUIDs-from-sync-source-when-res.patch
0003-build-compat-fix-line-offset-in-annotation-pragmas-p.patch
0004-drbd-fix-exposed_uuid-going-backward.patch
0005-drbd-Proper-locking-around-new_current_uuid-on-a-dis.patch
0006-build-CycloneDX-fix-bom-ref-add-purl.patch
0007-build-Another-update-to-the-spdx-files.patch
0008-build-generate-spdx.json-not-tag-value-format.patch
0009-compat-fix-gen_patch_names-for-bdev_file_open_by_pat.patch
0010-compat-fix-nla_nest_start_noflag-test.patch
0011-compat-fix-blk_alloc_disk-rule.patch
0012-drbd-remove-const-from-function-return-type.patch
0013-drbd-don-t-set-max_write_zeroes_sectors-in-decide_on.patch
0014-drbd-split-out-a-drbd_discard_supported-helper.patch
0015-drbd-atomically-update-queue-limits-in-drbd_reconsid.patch
0016-compat-test-and-patch-for-queue_limits_start_update.patch
0017-compat-specify-which-essential-change-was-not-made.patch
0018-gen_patch_names-reorder-blk_mode_t.patch
0019-compat-fix-blk_queue_update_readahead-patch.patch
0020-compat-test-and-patch-for-que_limits-max_hw_discard_.patch
0021-compat-fixup-write_zeroes__no_capable.patch
0022-compat-fixup-queue_flag_discard__yes_present.patch
0023-drbd-move-flags-to-queue_limits.patch
0024-compat-test-and-patch-for-queue_limits.features.patch
0025-drbd-Annotate-struct-fifo_buffer-with-__counted_by.patch
0026-compat-test-and-patch-for-__counted_by.patch
0027-drbd-fix-function-cast-warnings-in-state-machine.patch
0028-Add-missing-documentation-of-peer_device-parameter-t.patch
0030-drbd-kref_put-path-when-kernel_accept-fails.patch
0031-build-fix-typo-in-Makefile.spatch.patch
0032-drbd-open-do-not-delay-open-if-already-Primary.patch
* removed patch which is not needed anymore:
boo1231290_fix_drbd_build_error_against_kernel_v6.11.0.patch
boo1233222_fix_drbd_build_error_against_kernel_v6.11.6.patch
* update:
drbd_git_revision
drbd.spec
* add upstream patches to align commit d64ebe7eb7df:
0001-drbd-Fix-memory-leak.patch
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=155
48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
From 85afbf893a6c7cd55e04407731e52d495b6f228f Mon Sep 17 00:00:00 2001
|
|
From: Kees Cook <keescook@chromium.org>
|
|
Date: Fri, 15 Sep 2023 13:03:16 -0700
|
|
Subject: [PATCH 25/32] drbd: Annotate struct fifo_buffer with __counted_by
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Prepare for the coming implementation by GCC and Clang of the __counted_by
|
|
attribute. Flexible array members annotated with __counted_by can have
|
|
their accesses bounds-checked at run-time checking via CONFIG_UBSAN_BOUNDS
|
|
(for array indexing) and CONFIG_FORTIFY_SOURCE (for strcpy/memcpy-family
|
|
functions).
|
|
|
|
As found with Coccinelle[1], add __counted_by for struct fifo_buffer.
|
|
|
|
[1] https://github.com/kees/kernel-tools/blob/trunk/coccinelle/examples/counted_by.cocci
|
|
|
|
Cc: Philipp Reisner <philipp.reisner@linbit.com>
|
|
Cc: Lars Ellenberg <lars.ellenberg@linbit.com>
|
|
Cc: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
|
|
Cc: Jens Axboe <axboe@kernel.dk>
|
|
Cc: drbd-dev@lists.linbit.com
|
|
Cc: linux-block@vger.kernel.org
|
|
Reviewed-by: "Gustavo A. R. Silva" <gustavoars@kernel.org>
|
|
Link: https://lore.kernel.org/r/20230915200316.never.707-kees@kernel.org
|
|
Signed-off-by: Kees Cook <keescook@chromium.org>
|
|
---
|
|
drbd/drbd_int.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/drbd/drbd_int.h b/drbd/drbd_int.h
|
|
index c18407899f59..182593257c6a 100644
|
|
--- a/drbd/drbd_int.h
|
|
+++ b/drbd/drbd_int.h
|
|
@@ -746,7 +746,7 @@ struct fifo_buffer {
|
|
unsigned int head_index;
|
|
unsigned int size;
|
|
int total; /* sum of all values */
|
|
- int values[];
|
|
+ int values[] __counted_by(size);
|
|
};
|
|
extern struct fifo_buffer *fifo_alloc(unsigned int fifo_size);
|
|
|
|
--
|
|
2.35.3
|
|
|