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
82 lines
2.9 KiB
Diff
82 lines
2.9 KiB
Diff
From d64ebe7eb7df8c622b20bca38f3d7f4c7bb033c9 Mon Sep 17 00:00:00 2001
|
|
From: "zhengbing.huang" <zhengbing.huang@easystack.cn>
|
|
Date: Sun, 15 Dec 2024 14:50:56 +0800
|
|
Subject: [PATCH] drbd: Fix memory leak
|
|
|
|
In the output of kmemleak, we have the followe backtrace:
|
|
|
|
unreferenced object 0xffff8885b57cda80 (size 64):
|
|
comm "drbd_r_testimg4", pid 37104, jiffies 4494192827 (age 127162.843s)
|
|
hex dump (first 32 bytes):
|
|
31 20 6f 66 20 32 20 6e 6f 64 65 73 20 76 69 73 1 of 2 nodes vis
|
|
69 62 6c 65 2c 20 6e 65 65 64 20 32 20 66 6f 72 ible, need 2 for
|
|
backtrace:
|
|
[<000000006d641d68>] __kmalloc_track_caller+0x15c/0x270
|
|
[<000000006a7ffbcf>] kvasprintf+0xa7/0x120
|
|
[<000000002d2f15b3>] drbd_state_err+0xa9/0x190 [drbd]
|
|
[<000000006aa2f3df>] __is_valid_soft_transition+0xe99/0xec0 [drbd]
|
|
[<0000000009d68cc7>] try_state_change+0x4f0/0x840 [drbd]
|
|
[<00000000d5640f06>] ___end_state_change+0x140/0x12a0 [drbd]
|
|
[<000000009f4b8d71>] __end_state_change+0xa1/0x130 [drbd]
|
|
[<000000001c6de1a7>] change_connection_state+0x5ee/0xbd0 [drbd]
|
|
[<00000000ce4408d6>] process_twopc+0x1d3e/0x2ce0 [drbd]
|
|
[<00000000df3af6e8>] receive_twopc+0x17b/0x2b0 [drbd]
|
|
[<000000009701f919>] drbd_receiver+0x311/0x6e0 [drbd]
|
|
[<0000000092c4aeb1>] drbd_thread_setup+0x19d/0x430 [drbd]
|
|
[<0000000098e316ab>] kthread+0x19c/0x1c0
|
|
[<000000004c72b3a8>] ret_from_fork+0x1f/0x40
|
|
|
|
This is a memory leak.
|
|
|
|
In drbd_state_err() function, if resource->state_change_err_str is a null pointer,
|
|
the err_str will not be free.
|
|
And _drbd_state_err() has same issues.
|
|
|
|
So, if err_str has not put to up layer, free it in current function.
|
|
|
|
Signed-off-by: zhengbing.huang <zhengbing.huang@easystack.cn>
|
|
Signed-off-by: Joel Colledge <joel.colledge@linbit.com>
|
|
---
|
|
drbd/drbd_state.c | 14 ++++++++++----
|
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drbd/drbd_state.c b/drbd/drbd_state.c
|
|
index f498eaa60396..0e693c8e3af0 100644
|
|
--- a/drbd/drbd_state.c
|
|
+++ b/drbd/drbd_state.c
|
|
@@ -1557,10 +1557,13 @@ static __printf(2, 3) void _drbd_state_err(struct change_context *context, const
|
|
va_end(args);
|
|
if (!err_str)
|
|
return;
|
|
- if (context->err_str)
|
|
- *context->err_str = err_str;
|
|
if (context->flags & CS_VERBOSE)
|
|
drbd_err(resource, "%s\n", err_str);
|
|
+
|
|
+ if (context->err_str)
|
|
+ *context->err_str = err_str;
|
|
+ else
|
|
+ kfree(err_str);
|
|
}
|
|
|
|
static __printf(2, 3) void drbd_state_err(struct drbd_resource *resource, const char *fmt, ...)
|
|
@@ -1573,10 +1576,13 @@ static __printf(2, 3) void drbd_state_err(struct drbd_resource *resource, const
|
|
va_end(args);
|
|
if (!err_str)
|
|
return;
|
|
- if (resource->state_change_err_str)
|
|
- *resource->state_change_err_str = err_str;
|
|
if (resource->state_change_flags & CS_VERBOSE)
|
|
drbd_err(resource, "%s\n", err_str);
|
|
+
|
|
+ if (resource->state_change_err_str)
|
|
+ *resource->state_change_err_str = err_str;
|
|
+ else
|
|
+ kfree(err_str);
|
|
}
|
|
|
|
static enum drbd_state_rv __is_valid_soft_transition(struct drbd_resource *resource)
|
|
--
|
|
2.43.0
|
|
|