40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
|
From 9ae62977b51dab0f4bb46b1c8ea5ebd1705b2f4d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Logan Gunthorpe <logang@deltatee.com>
|
||
|
|
Date: Wed, 22 Jun 2022 14:25:10 -0600
|
||
|
|
Subject: [PATCH 35/61] monitor: Avoid segfault when calling NULL
|
||
|
|
get_bad_blocks
|
||
|
|
Patch-mainline: mdadm-4.2+
|
||
|
|
References: jsc#PED-1009
|
||
|
|
|
||
|
|
Not all struct superswitch implement a get_bad_blocks() function,
|
||
|
|
yet mdmon seems to call it without checking for NULL and thus
|
||
|
|
occasionally segfaults in the test 10ddf-geometry.
|
||
|
|
|
||
|
|
Fix this by checking for NULL before calling it.
|
||
|
|
|
||
|
|
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
|
||
|
|
Acked-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
|
||
|
|
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
|
||
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
||
|
|
---
|
||
|
|
monitor.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/monitor.c b/monitor.c
|
||
|
|
index b877e59..820a93d 100644
|
||
|
|
--- a/monitor.c
|
||
|
|
+++ b/monitor.c
|
||
|
|
@@ -311,6 +311,9 @@ static int check_for_cleared_bb(struct active_array *a, struct mdinfo *mdi)
|
||
|
|
struct md_bb *bb;
|
||
|
|
int i;
|
||
|
|
|
||
|
|
+ if (!ss->get_bad_blocks)
|
||
|
|
+ return -1;
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* Get a list of bad blocks for an array, then read list of
|
||
|
|
* acknowledged bad blocks from kernel and compare it against metadata
|
||
|
|
--
|
||
|
|
2.35.3
|
||
|
|
|