ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

The number of segments accepted should be bounded by MCA_BTL_DES_MAX_SEGMENTS

Просмотр исходного кода 
and not by 2.

This commit was SVN r25515.
Этот коммит содержится в:
George Bosilca 2011-11-28 17:19:12 +00:00
родитель f8c8c641f1
Коммит 0bd2bf9aae
2 изменённых файлов: 6 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
ompi/mca/pml/csum/pml_csum_recvfrag.c
Просмотреть файл

@ -2,7 +2,7 @@
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* University Research and Technology * University Research and Technology
* Corporation. All rights reserved. * Corporation. All rights reserved.
* Copyright (c) 2004-2008 The University of Tennessee and The University * Copyright (c) 2004-2011 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
@ -148,8 +148,7 @@ void mca_pml_csum_recv_frag_callback_match(mca_btl_base_module_t* btl,
uint16_t csum_received, csum=0; uint16_t csum_received, csum=0;
uint32_t csum_data; uint32_t csum_data;
/* NTH: FIXME -- we will clobber the stack if num_segments > 2 (see lines 260, 276-281) */ assert(num_segments <= MCA_BTL_DES_MAX_SEGMENTS);
assert(num_segments < 3);
if( OPAL_UNLIKELY(segments->seg_len < OMPI_PML_CSUM_MATCH_HDR_LEN) ) { if( OPAL_UNLIKELY(segments->seg_len < OMPI_PML_CSUM_MATCH_HDR_LEN) ) {
return; return;
@ -257,7 +256,7 @@ void mca_pml_csum_recv_frag_callback_match(mca_btl_base_module_t* btl,
MCA_PML_CSUM_RECV_REQUEST_MATCHED(match, hdr); MCA_PML_CSUM_RECV_REQUEST_MATCHED(match, hdr);
if(match->req_bytes_expected > 0) { if(match->req_bytes_expected > 0) {
struct iovec iov[2]; struct iovec iov[MCA_BTL_DES_MAX_SEGMENTS];
uint32_t iov_count = 1; uint32_t iov_count = 1;
/* /*

7
ompi/mca/pml/ob1/pml_ob1_recvfrag.c
Просмотреть файл

@ -2,7 +2,7 @@
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
* University Research and Technology * University Research and Technology
* Corporation. All rights reserved. * Corporation. All rights reserved.
* Copyright (c) 2004-2009 The University of Tennessee and The University * Copyright (c) 2004-2011 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights * of Tennessee Research Foundation. All rights
* reserved. * reserved.
* Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, * Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
@ -112,8 +112,7 @@ void mca_pml_ob1_recv_frag_callback_match(mca_btl_base_module_t* btl,
size_t num_segments = des->des_dst_cnt; size_t num_segments = des->des_dst_cnt;
size_t bytes_received = 0; size_t bytes_received = 0;
/* NTH: FIXME -- we will clobber the stack if num_segments > 2 (see lines 199, 215-220) */ assert(num_segments <= MCA_BTL_DES_MAX_SEGMENTS);
assert(num_segments < 3);
if( OPAL_UNLIKELY(segments->seg_len < OMPI_PML_OB1_MATCH_HDR_LEN) ) { if( OPAL_UNLIKELY(segments->seg_len < OMPI_PML_OB1_MATCH_HDR_LEN) ) {
return; return;
@ -196,7 +195,7 @@ void mca_pml_ob1_recv_frag_callback_match(mca_btl_base_module_t* btl,
MCA_PML_OB1_RECV_REQUEST_MATCHED(match, hdr); MCA_PML_OB1_RECV_REQUEST_MATCHED(match, hdr);
if(match->req_bytes_expected > 0) { if(match->req_bytes_expected > 0) {
struct iovec iov[2]; struct iovec iov[MCA_BTL_DES_MAX_SEGMENTS];
uint32_t iov_count = 1; uint32_t iov_count = 1;
/* /*