From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Mon, 4 Jan 2021 21:59:54 -0600 Subject: [PATCH] libmultipath: check for null wwid before strcmp Commit 749aabd0 (libmultipath: ignore multipaths sections without wwid option) removed all mpentries with a NULL wwid, but didn't stop strcmp() from being run on them in merge_mptable(). The result of strcmp() with a NULL parameter is undefined, so fix that. Signed-off-by: Benjamin Marzinski Reviewed-by: Martin Wilck Signed-off-by: Benjamin Marzinski --- libmultipath/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmultipath/config.c b/libmultipath/config.c index dc81c994..dd645f17 100644 --- a/libmultipath/config.c +++ b/libmultipath/config.c @@ -453,7 +453,7 @@ void merge_mptable(vector mptable) } j = i + 1; vector_foreach_slot_after(mptable, mp2, j) { - if (strcmp(mp1->wwid, mp2->wwid)) + if (!mp2->wwid || strcmp(mp1->wwid, mp2->wwid)) continue; condlog(1, "%s: duplicate multipath config section for %s", __func__, mp1->wwid); -- 2.17.2