3ec0ebefcd
- Update Source to latest upstream commit
* Previous patches 0001-0011 are included in this commit
- Rename files
* Previous patches 0012-0019 are now patches 0021-0028
- Add 0001-libmultipath-fix-tur-checker-timeout.patch
- Add 0002-libmultipath-fix-tur-checker-double-locking.patch
- Add 0003-libmultipath-fix-tur-memory-misuse.patch
- Add 0004-libmultipath-cleanup-tur-locking.patch
- Add 0005-libmultipath-fix-tur-checker-timeout-issue.patch
* The above 5 patches cleanup locking issues with the
tur checker threads
- Add 0006-libmultipath-fix-set_int-error-path.patch
- Add 0007-libmultipath-fix-length-issues-in-get_vpd_sgio.patch
- Add 0008-libmultipath-_install_keyword-cleanup.patch
- Add 0009-libmultipath-remove-unused-code.patch
- Add 0010-libmultipath-fix-memory-issue-in-path_latency-prio.patch
- Add 0011-libmultipath-fix-null-dereference-int-alloc_path_gro.patch
- Add 0012-libmutipath-don-t-use-malformed-uevents.patch
- Add 0013-multipath-fix-max-array-size-in-print_cmd_valid.patch
- Add 0014-multipathd-function-return-value-tweaks.patch
- Add 0015-multipathd-minor-fixes.patch
- Add 0016-multipathd-remove-useless-check-and-fix-format.patch
- Add 0017-multipathd-fix-memory-leak-on-error-in-configure.patch
* The above 12 patches fix minor issues found by coverity
- Add 0018-libmultipath-Don-t-blank-intialized-paths.patch
- Add 0019-libmultipath-Fixup-updating-paths.patch
* Fix issues with paths whose wwid was not set or later changes
- Add 0020-multipath-tweak-logging-style.patch
* multipathd interactive commands now send errors to stderr, instead
of syslog
* The above 20 patches have been submitted upstream
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Fri, 27 Jul 2018 18:01:14 -0500
|
|
Subject: [PATCH] libmultipath: _install_keyword cleanup
|
|
|
|
_install_keyword should use VECTOR_LAST_SLOT(), which has better error
|
|
checking. It should also fail if it gets a NULL pointer, instead of
|
|
dereferencing it. Found by coverity.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmultipath/parser.c | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libmultipath/parser.c b/libmultipath/parser.c
|
|
index b8b7e0d..92ef7cf 100644
|
|
--- a/libmultipath/parser.c
|
|
+++ b/libmultipath/parser.c
|
|
@@ -79,12 +79,16 @@ _install_keyword(vector keywords, char *string,
|
|
struct keyword *keyword;
|
|
|
|
/* fetch last keyword */
|
|
- keyword = VECTOR_SLOT(keywords, VECTOR_SIZE(keywords) - 1);
|
|
+ keyword = VECTOR_LAST_SLOT(keywords);
|
|
+ if (!keyword)
|
|
+ return 1;
|
|
|
|
/* position to last sub level */
|
|
- for (i = 0; i < sublevel; i++)
|
|
- keyword =
|
|
- VECTOR_SLOT(keyword->sub, VECTOR_SIZE(keyword->sub) - 1);
|
|
+ for (i = 0; i < sublevel; i++) {
|
|
+ keyword = VECTOR_LAST_SLOT(keyword->sub);
|
|
+ if (!keyword)
|
|
+ return 1;
|
|
+ }
|
|
|
|
/* First sub level allocation */
|
|
if (!keyword->sub)
|
|
--
|
|
2.7.4
|
|
|