Jan Engelhardt
3dff4d17f4
- Remove dependence of smartcols bcache-tools.spec, bcache-tools code doesn't need it now. (jsc#SLE-9807) - Remove 1001-udev-do-not-rely-on-DRIVER-variable.patch because we have 0013-bcache-tools-Export-CACHED_UUID-and-CACHED_LABEL.patch to provide static UUIDs. (jsc#SLE-9807) - bcache-tools: add man page bcache-status.8 (jsc#SLE-9807) 0017-bcache-tools-add-man-page-bcache-status.8.patch - bcache-tools: add bcache-status (jsc#SLE-9807) 0016-bcache-tools-add-bcache-status.patch - bcache-tools: make: permit only one cache device to be specified (jsc#SLE-9807) 0015-bcache-tools-make-permit-only-one-cache-device-to-be.patch - bcache-tools: Remove the dependency on libsmartcols (jsc#SLE-9807) 0014-bcache-tools-Remove-the-dependency-on-libsmartcols.patch - bcache-tools: Export CACHED_UUID and CACHED_LABEL (jsc#SLE-9807) 0013-bcache-tools-Export-CACHED_UUID-and-CACHED_LABEL.patch - bcache-tools: Fix potential coredump issues (jsc#SLE-9807) 0012-bcache-tools-Fix-potential-coredump-issues.patch - bcache-tools: add print_cache_set_supported_feature_sets() in lib.c (jsc#SLE-9807) 0011-bcache-tools-add-print_cache_set_supported_feature_s.patch - bcache-tools: add large_bucket incompat feature (jsc#SLE-9807) 0010-bcache-tools-add-large_bucket-incompat-feature.patch - bcache-tools: upgrade super block versions for feature sets (jsc#SLE-9807) 0009-bcache-tools-upgrade-super-block-versions-for-featur.patch - bcache-tools: define separated super block for in-memory and on-disk format (jsc#SLE-9807) OBS-URL: https://build.opensuse.org/request/show/841483 OBS-URL: https://build.opensuse.org/package/show/filesystems/bcache-tools?expand=0&rev=27
100 lines
3.1 KiB
Diff
100 lines
3.1 KiB
Diff
From b0f5169a13976b05b183e0cde1fd23ef4f90101c Mon Sep 17 00:00:00 2001
|
|
From: Shaoxiong Li <dahefanteng@gmail.com>
|
|
Date: Wed, 19 Aug 2020 18:51:26 +0800
|
|
Subject: [PATCH 12/17] bcache-tools: Fix potential coredump issues
|
|
Git-commit: b0f5169a13976b05b183e0cde1fd23ef4f90101c
|
|
Patch-mainline: bcache-tools-1.1
|
|
References: jsc#SLE-9807
|
|
|
|
In some distributions, such as opensuse 15.2, when the free_dev
|
|
function is called, it may refer to the memory that has been
|
|
released, causing a coredump. Changing 'list_for_each_entry'
|
|
to 'list_for_each_entry_safe' can avoid this problem.
|
|
|
|
Signed-off-by: Shaoxiong Li <dahefanteng@gmail.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
---
|
|
bcache.c | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/bcache.c b/bcache.c
|
|
index 50e3a88..3b963e4 100644
|
|
--- a/bcache.c
|
|
+++ b/bcache.c
|
|
@@ -175,9 +175,9 @@ int version_usagee(void)
|
|
|
|
void free_dev(struct list_head *head)
|
|
{
|
|
- struct dev *dev;
|
|
+ struct dev *dev, *n;
|
|
|
|
- list_for_each_entry(dev, head, dev_list) {
|
|
+ list_for_each_entry_safe(dev, n, head, dev_list) {
|
|
free(dev);
|
|
}
|
|
}
|
|
@@ -185,7 +185,7 @@ void free_dev(struct list_head *head)
|
|
int show_bdevs_detail(void)
|
|
{
|
|
struct list_head head;
|
|
- struct dev *devs;
|
|
+ struct dev *devs, *n;
|
|
|
|
INIT_LIST_HEAD(&head);
|
|
int ret;
|
|
@@ -197,7 +197,7 @@ int show_bdevs_detail(void)
|
|
}
|
|
printf("Name\t\tUuid\t\t\t\t\tCset_Uuid\t\t\t\tType\t\tState");
|
|
printf("\t\t\tBname\t\tAttachToDev\tAttachToCset\n");
|
|
- list_for_each_entry(devs, &head, dev_list) {
|
|
+ list_for_each_entry_safe(devs, n, &head, dev_list) {
|
|
printf("%s\t%s\t%s\t%lu", devs->name, devs->uuid,
|
|
devs->cset, devs->version);
|
|
switch (devs->version) {
|
|
@@ -242,7 +242,7 @@ int show_bdevs_detail(void)
|
|
int show_bdevs(void)
|
|
{
|
|
struct list_head head;
|
|
- struct dev *devs;
|
|
+ struct dev *devs, *n;
|
|
|
|
INIT_LIST_HEAD(&head);
|
|
int ret;
|
|
@@ -254,7 +254,7 @@ int show_bdevs(void)
|
|
}
|
|
|
|
printf("Name\t\tType\t\tState\t\t\tBname\t\tAttachToDev\n");
|
|
- list_for_each_entry(devs, &head, dev_list) {
|
|
+ list_for_each_entry_safe(devs, n, &head, dev_list) {
|
|
printf("%s\t%lu", devs->name, devs->version);
|
|
switch (devs->version) {
|
|
// These are handled the same by the kernel
|
|
@@ -428,7 +428,7 @@ int detail_single(char *devname)
|
|
int tree(void)
|
|
{
|
|
struct list_head head;
|
|
- struct dev *devs, *tmp;
|
|
+ struct dev *devs, *tmp, *n, *m;
|
|
|
|
INIT_LIST_HEAD(&head);
|
|
int ret;
|
|
@@ -445,13 +445,13 @@ int tree(void)
|
|
tb = scols_new_table();
|
|
scols_table_new_column(tb, ".", 0.1, SCOLS_FL_TREE);
|
|
scols_table_new_column(tb, "", 2, SCOLS_FL_TRUNC);
|
|
- list_for_each_entry(devs, &head, dev_list) {
|
|
+ list_for_each_entry_safe(devs, n, &head, dev_list) {
|
|
if ((devs->version == BCACHE_SB_VERSION_CDEV
|
|
|| devs->version == BCACHE_SB_VERSION_CDEV_WITH_UUID)
|
|
&& strcmp(devs->state, BCACHE_BASIC_STATE_ACTIVE) == 0) {
|
|
dad = scols_table_new_line(tb, NULL);
|
|
scols_line_set_data(dad, COL_CSET, devs->name);
|
|
- list_for_each_entry(tmp, &head, dev_list) {
|
|
+ list_for_each_entry_safe(tmp, m, &head, dev_list) {
|
|
if (strcmp(devs->cset, tmp->attachuuid) ==
|
|
0) {
|
|
son =
|
|
--
|
|
2.26.2
|
|
|