996407fc5f
Update Source to latest upstream commit Rename files * Previous patches 0001-0020 are now patches 0002-0021 * Previous patches 0021-0028 are now patches 0026-0033 Add 0001-kpartx-Use-absolute-paths-to-create-mappings.patch Add 0022-multipathd-check-for-NULL-udevice-in-cli_add_path.patch Add 0023-libmultipath-remove-max_fds-code-duplication.patch Add 0024-multipathd-set-return-code-for-multipathd-commands.patch Add 0025-mpathpersist-fix-registration-rollback-issue.patch * The above 5 patches have been submitted upstream
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Fri, 5 Oct 2018 17:20:38 -0500
|
|
Subject: [PATCH] multipathd: check for NULL udevice in cli_add_path
|
|
|
|
If cli_add_path can't get a udevice for the path, it should fail,
|
|
instead of continuing with a NULL udevice.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipathd/cli_handlers.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c
|
|
index bb16472..7500080 100644
|
|
--- a/multipathd/cli_handlers.c
|
|
+++ b/multipathd/cli_handlers.c
|
|
@@ -720,6 +720,10 @@ cli_add_path (void * v, char ** reply, int * len, void * data)
|
|
udevice = udev_device_new_from_subsystem_sysname(udev,
|
|
"block",
|
|
param);
|
|
+ if (!udevice) {
|
|
+ condlog(0, "%s: can't find path", param);
|
|
+ return 1;
|
|
+ }
|
|
conf = get_multipath_config();
|
|
pthread_cleanup_push(put_multipath_config, conf);
|
|
r = store_pathinfo(vecs->pathvec, conf,
|
|
--
|
|
2.7.4
|
|
|