Your Name
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 2296a4a441b4b8546e2eb32403930f1bb8f3ee4a Mon Sep 17 00:00:00 2001
|
|
From: Logan Gunthorpe <logang@deltatee.com>
|
|
Date: Wed, 22 Jun 2022 14:25:10 -0600
|
|
Subject: [PATCH 4/4] monitor: Avoid segfault when calling NULL get_bad_blocks
|
|
|
|
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>
|
|
|
|
Upstream-Status: Backport
|
|
|
|
Reference to upstream patch:
|
|
https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/commit/?id=9ae62977b51d
|
|
|
|
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
|
|
---
|
|
monitor.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/monitor.c b/monitor.c
|
|
index afc3e50..8e43c0d 100644
|
|
--- a/monitor.c
|
|
+++ b/monitor.c
|
|
@@ -312,6 +312,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.39.1
|
|
|