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
31 lines
903 B
Diff
31 lines
903 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Mon, 30 Jul 2018 18:06:11 -0500
|
|
Subject: [PATCH] multipath: fix max array size in print_cmd_valid
|
|
|
|
The code is attempting to verify that 0 <= k < 3
|
|
However, sizeof(val) is 12, assuming 4 byte integers. The check needs to
|
|
take integer size into account. Found by coverity.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
multipath/main.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/multipath/main.c b/multipath/main.c
|
|
index fc5bf16..d5aad95 100644
|
|
--- a/multipath/main.c
|
|
+++ b/multipath/main.c
|
|
@@ -482,7 +482,7 @@ static int print_cmd_valid(int k, const vector pathvec,
|
|
struct timespec until;
|
|
struct path *pp;
|
|
|
|
- if (k < 0 || k >= sizeof(vals))
|
|
+ if (k < 0 || k >= (sizeof(vals) / sizeof(int)))
|
|
return 1;
|
|
|
|
if (k == 2) {
|
|
--
|
|
2.7.4
|
|
|