Skip to content

Commit 5fe7953

Browse files
authored
Merge pull request #12824 from Sergei-Lebedev/topic/coll_ucc_fix_buf_size_overflow_v4
v4.1.x: coll/ucc: fix int overflow in coll init
2 parents 0c63a1a + af6a8f1 commit 5fe7953

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

ompi/mca/coll/ucc/coll_ucc_allgather.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
#include "coll_ucc_common.h"
1111

12-
static inline ucc_status_t mca_coll_ucc_allgather_init(const void *sbuf, int scount, struct ompi_datatype_t *sdtype,
13-
void* rbuf, int rcount, struct ompi_datatype_t *rdtype,
12+
static inline ucc_status_t mca_coll_ucc_allgather_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
13+
void* rbuf, size_t rcount, struct ompi_datatype_t *rdtype,
1414
mca_coll_ucc_module_t *ucc_module,
1515
ucc_coll_req_h *req,
1616
mca_coll_ucc_req_t *coll_req)

ompi/mca/coll/ucc/coll_ucc_allgatherv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "coll_ucc_common.h"
1111

12-
static inline ucc_status_t mca_coll_ucc_allgatherv_init(const void *sbuf, int scount,
12+
static inline ucc_status_t mca_coll_ucc_allgatherv_init(const void *sbuf, size_t scount,
1313
struct ompi_datatype_t *sdtype,
1414
void* rbuf, const int *rcounts, const int *rdisps,
1515
struct ompi_datatype_t *rdtype,

ompi/mca/coll/ucc/coll_ucc_allreduce.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#include "coll_ucc_common.h"
1111

12-
static inline ucc_status_t mca_coll_ucc_allreduce_init(const void *sbuf, void *rbuf, int count,
12+
static inline ucc_status_t mca_coll_ucc_allreduce_init(const void *sbuf, void *rbuf, size_t count,
1313
struct ompi_datatype_t *dtype,
1414
struct ompi_op_t *op, mca_coll_ucc_module_t *ucc_module,
1515
ucc_coll_req_h *req,

ompi/mca/coll/ucc/coll_ucc_alltoall.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
#include "coll_ucc_common.h"
1111

12-
static inline ucc_status_t mca_coll_ucc_alltoall_init(const void *sbuf, int scount, struct ompi_datatype_t *sdtype,
13-
void* rbuf, int rcount, struct ompi_datatype_t *rdtype,
12+
static inline ucc_status_t mca_coll_ucc_alltoall_init(const void *sbuf, size_t scount, struct ompi_datatype_t *sdtype,
13+
void* rbuf, size_t rcount, struct ompi_datatype_t *rdtype,
1414
mca_coll_ucc_module_t *ucc_module,
1515
ucc_coll_req_h *req,
1616
mca_coll_ucc_req_t *coll_req)

ompi/mca/coll/ucc/coll_ucc_bcast.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "coll_ucc_common.h"
1010

11-
static inline ucc_status_t mca_coll_ucc_bcast_init(void *buf, int count, struct ompi_datatype_t *dtype,
11+
static inline ucc_status_t mca_coll_ucc_bcast_init(void *buf, size_t count, struct ompi_datatype_t *dtype,
1212
int root, mca_coll_ucc_module_t *ucc_module,
1313
ucc_coll_req_h *req,
1414
mca_coll_ucc_req_t *coll_req)

ompi/mca/coll/ucc/coll_ucc_reduce.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#include "coll_ucc_common.h"
1010

11-
static inline ucc_status_t mca_coll_ucc_reduce_init(const void *sbuf, void *rbuf, int count,
11+
static inline ucc_status_t mca_coll_ucc_reduce_init(const void *sbuf, void *rbuf, size_t count,
1212
struct ompi_datatype_t *dtype,
1313
struct ompi_op_t *op, int root,
1414
mca_coll_ucc_module_t *ucc_module,

0 commit comments

Comments
 (0)