forked from pool/mdadm
850cf2857b
- SLE15 continues to use mdadm-4.0, synchronize mdadm package from
SLE12-SP3 to SLE15, re-order all patches.
- Rename the following patches, they are deleted and re-add in next
part of patches
0001-Generic-support-for-consistency-policy-and-PPL.patch
0002-Detail-show-consistency-policy.patch
0002-The-mdcheck-script-now-adds-messages-to-the-system.patch
0003-imsm-PPL-support.patch
0004-super1-PPL-support.patch
0005-Add-ppl-and-no-ppl-options-for-update.patch
0006-Grow-support-consistency-policy-change.patch
0007-udev-md-raid-assembly.rules-Skip-non-ready-devices.patch
0008-Retry-HOT_REMOVE_DISK-a-few-times.patch
0009-Introduce-sys_hot_remove_disk.patch
0010-Add-force-flag-to-hot_remove_disk.patch
0011-Detail-handle-non-existent-arrays-better.patch
- Synchronize patches from mdadm of SLE12-SP3, the above renamed
patches are re-add here,
0001-Makefile-Fix-date-to-be-output-in-ISO-format.patch
0002-imsm-fix-missing-error-message-during-migration.patch
0003-Fix-oddity-where-mdadm-did-not-recognise-a-relative-.patch
0004-mdadm-check-the-nodes-when-operate-clustered-array.patch
0005-examine-tidy-up-some-code.patch
0006-mdadm-add-man-page-for-symlinks.patch
0007-mdadm-add-checking-clustered-bitmap-in-assemble-mode.patch
0008-mdadm-Add-Wimplicit-fallthrough-0-in-Makefile.patch
0009-mdadm-Specify-enough-length-when-write-to-buffer.patch
0010-mdadm-it-doesn-t-make-sense-to-set-bitmap-twice.patch
0011-mdadm-Monitor-Fix-NULL-pointer-dereference-when-stat.patch
0012-Replace-snprintf-with-strncpy-at-some-places-to-avoi.patch
OBS-URL: https://build.opensuse.org/request/show/517978
OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=150
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 6438c249c4fed92cf6e5fb492d19f4c4f516ff6f Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.com>
|
|
Date: Fri, 4 Aug 2017 15:30:02 +1000
|
|
Subject: [PATCH] super1: only set clustered flag when bitmap is present
|
|
Patch-mainline: mdadm-4.0
|
|
References: bsc#1047314
|
|
|
|
If no bitmap is present, then the test
|
|
|
|
if (__le32_to_cpu(bsb->nodes) > 1)
|
|
|
|
accesses uninitialised memory. So move that test inside
|
|
a test for a bitmap being present.
|
|
|
|
Note by Coly Li: this patch is modified for SLE12-SP3.
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
---
|
|
super1.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
Index: mdadm-4.0/super1.c
|
|
===================================================================
|
|
--- mdadm-4.0.orig/super1.c
|
|
+++ mdadm-4.0/super1.c
|
|
@@ -950,14 +950,14 @@ static void getinfo_super1(struct supert
|
|
info->array.state =
|
|
(__le64_to_cpu(sb->resync_offset) == MaxSector)
|
|
? 1 : 0;
|
|
- if (__le32_to_cpu(bsb->nodes) > 1)
|
|
- info->array.state |= (1 << MD_SB_CLUSTERED);
|
|
|
|
super_offset = __le64_to_cpu(sb->super_offset);
|
|
info->data_offset = __le64_to_cpu(sb->data_offset);
|
|
info->component_size = __le64_to_cpu(sb->size);
|
|
if (sb->feature_map & __le32_to_cpu(MD_FEATURE_BITMAP_OFFSET)) {
|
|
info->bitmap_offset = (int32_t)__le32_to_cpu(sb->bitmap_offset);
|
|
+ if (__le32_to_cpu(bsb->nodes) > 1)
|
|
+ info->array.state |= (1 << MD_SB_CLUSTERED);
|
|
} else if (sb->feature_map & __le32_to_cpu(MD_FEATURE_PPL)) {
|
|
info->ppl_offset = __le16_to_cpu(sb->ppl.offset);
|
|
info->ppl_size = __le16_to_cpu(sb->ppl.size);
|