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.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Mon, 30 Jul 2018 14:41:55 -0500
|
|
Subject: [PATCH] libmultipath: fix memory issue in path_latency prio
|
|
|
|
The path_latency prioriziter was assuming that prepare_directio_read()
|
|
always succeeds. However, it doesn't, and when it fails, the prioritizer
|
|
used buf without it pointing to alloced memory. Found by coverity.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/prioritizers/path_latency.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libmultipath/prioritizers/path_latency.c b/libmultipath/prioritizers/path_latency.c
|
|
index 765265c..eeee01e 100644
|
|
--- a/libmultipath/prioritizers/path_latency.c
|
|
+++ b/libmultipath/prioritizers/path_latency.c
|
|
@@ -237,7 +237,8 @@ int getprio(struct path *pp, char *args, unsigned int timeout)
|
|
lg_maxavglatency = log(MAX_AVG_LATENCY) / lg_base;
|
|
lg_minavglatency = log(MIN_AVG_LATENCY) / lg_base;
|
|
|
|
- prepare_directio_read(pp->fd, &blksize, &buf, &restore_flags);
|
|
+ if (prepare_directio_read(pp->fd, &blksize, &buf, &restore_flags) < 0)
|
|
+ return PRIO_UNDEF;
|
|
|
|
temp = io_num;
|
|
while (temp-- > 0) {
|
|
--
|
|
2.7.4
|
|
|