|
 |
720be6 |
From 5efe6f70f310858f554287bcf7883442380a0701 Mon Sep 17 00:00:00 2001
|
|
|
720be6 |
From: Nathan Hjelm <hjelmn@lanl.gov>
|
|
|
720be6 |
Date: Tue, 28 Jun 2016 10:26:16 -0600
|
|
|
720be6 |
Subject: [PATCH] btl/openib: fix segmentation fault
|
|
|
720be6 |
|
|
|
720be6 |
This commit fixes a segmentation fault that occurs if a device can be
|
|
|
720be6 |
initialized but not used. In this case the devices_count is not equal
|
|
|
720be6 |
to the number of usable devices in the devices pointer array.
|
|
|
720be6 |
|
|
|
720be6 |
Thanks to @artpol84 for tracking this down.
|
|
|
720be6 |
|
|
|
720be6 |
Fixes open-mpi/ompi#1823
|
|
|
720be6 |
|
|
|
720be6 |
Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
|
|
|
720be6 |
(cherry picked from commit 8128c8eb29d6adde288fca5db3f71fb98e1727f6)
|
|
|
720be6 |
---
|
|
|
720be6 |
ompi/mca/btl/openib/btl_openib_component.c | 4 +++-
|
|
|
720be6 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
720be6 |
|
|
|
720be6 |
diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c
|
|
|
720be6 |
index 40831f2373..d1376e0a58 100644
|
|
|
720be6 |
--- a/ompi/mca/btl/openib/btl_openib_component.c
|
|
|
720be6 |
+++ b/ompi/mca/btl/openib/btl_openib_component.c
|
|
|
720be6 |
@@ -3630,7 +3630,9 @@ static int btl_openib_component_progress(void)
|
|
|
720be6 |
for(i = 0; i < mca_btl_openib_component.devices_count; i++) {
|
|
|
720be6 |
mca_btl_openib_device_t *device =
|
|
|
720be6 |
(mca_btl_openib_device_t *) opal_pointer_array_get_item(&mca_btl_openib_component.devices, i);
|
|
|
720be6 |
- count += progress_one_device(device);
|
|
|
720be6 |
+ if (NULL != device) {
|
|
|
720be6 |
+ count += progress_one_device(device);
|
|
|
720be6 |
+ }
|
|
|
720be6 |
}
|
|
|
720be6 |
|
|
|
720be6 |
#if OPAL_CUDA_SUPPORT /* CUDA_ASYNC_SEND */
|
|
|
720be6 |
--
|
|
|
720be6 |
2.13.5
|
|
|
720be6 |
|