Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
maestro-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
maestro
maestro-core
Commits
46cd29a3
Commit
46cd29a3
authored
4 years ago
by
Utz-Uwe Haus
Browse files
Options
Downloads
Patches
Plain Diff
Avoid READ buffer overrun when printing GNI EP description
parent
97acd392
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!3
Jsc ci update
,
!2
update JSC-CI branch to devel
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
maestro/ofi.c
+41
-9
41 additions, 9 deletions
maestro/ofi.c
with
41 additions
and
9 deletions
maestro/ofi.c
+
41
−
9
View file @
46cd29a3
...
@@ -1002,6 +1002,7 @@ BAILOUT:
...
@@ -1002,6 +1002,7 @@ BAILOUT:
const
char
*
const
char
*
mstro_ep_desc_describe
(
mstro_endpoint_descriptor
desc
)
mstro_ep_desc_describe
(
mstro_endpoint_descriptor
desc
)
{
{
int
s
;
/* FIXME: May need locking */
/* FIXME: May need locking */
if
(
desc
==
NULL
)
if
(
desc
==
NULL
)
return
"(null)"
;
return
"(null)"
;
...
@@ -1012,16 +1013,26 @@ mstro_ep_desc_describe(mstro_endpoint_descriptor desc)
...
@@ -1012,16 +1013,26 @@ mstro_ep_desc_describe(mstro_endpoint_descriptor desc)
char
*
service
=
buf
+
2
*
MSTRO_EP_DESC_STRMAX
;
char
*
service
=
buf
+
2
*
MSTRO_EP_DESC_STRMAX
;
switch
(
desc
->
type
)
{
switch
(
desc
->
type
)
{
case
MSTRO_EP_OFI_IN4
:
case
MSTRO_EP_OFI_IN4
:
getnameinfo
((
struct
sockaddr
*
)
&
desc
->
in4
,
sizeof
(
struct
sockaddr_in
),
s
=
getnameinfo
((
struct
sockaddr
*
)
&
desc
->
in4
,
sizeof
(
struct
sockaddr_in
),
host
,
MSTRO_EP_DESC_STRMAX
,
host
,
MSTRO_EP_DESC_STRMAX
,
service
,
MSTRO_EP_DESC_STRMAX
,
service
,
MSTRO_EP_DESC_STRMAX
,
NI_NUMERICHOST
|
NI_NUMERICSERV
);
NI_NUMERICHOST
|
NI_NUMERICSERV
);
if
(
s
!=
0
)
{
ERR
(
"Failed to obtain IN4 address: %d (%s)
\n
"
,
errno
,
strerror
(
errno
));
abort
();
}
break
;
break
;
case
MSTRO_EP_OFI_IN6
:
case
MSTRO_EP_OFI_IN6
:
getnameinfo
((
struct
sockaddr
*
)
&
desc
->
in6
,
sizeof
(
struct
sockaddr_in6
),
s
=
getnameinfo
((
struct
sockaddr
*
)
&
desc
->
in6
,
sizeof
(
struct
sockaddr_in6
),
host
,
MSTRO_EP_DESC_STRMAX
,
host
,
MSTRO_EP_DESC_STRMAX
,
service
,
MSTRO_EP_DESC_STRMAX
,
service
,
MSTRO_EP_DESC_STRMAX
,
NI_NUMERICHOST
|
NI_NUMERICSERV
);
NI_NUMERICHOST
|
NI_NUMERICSERV
);
if
(
s
!=
0
)
{
ERR
(
"Failed to obtain IN6 address: %d (%s)
\n
"
,
errno
,
strerror
(
errno
));
abort
();
}
break
;
break
;
#ifdef HAVE_IB
#ifdef HAVE_IB
/* case FI_SOCKADDR_IB: */
/* case FI_SOCKADDR_IB: */
...
@@ -1030,22 +1041,38 @@ mstro_ep_desc_describe(mstro_endpoint_descriptor desc)
...
@@ -1030,22 +1041,38 @@ mstro_ep_desc_describe(mstro_endpoint_descriptor desc)
case
MSTRO_EP_OFI_PSMX
:
case
MSTRO_EP_OFI_PSMX
:
case
MSTRO_EP_OFI_BGQ
:
case
MSTRO_EP_OFI_BGQ
:
case
MSTRO_EP_OFI_MLX
:
case
MSTRO_EP_OFI_MLX
:
snprintf
(
host
,
MSTRO_EP_DESC_STRMAX
,
s
=
snprintf
(
host
,
MSTRO_EP_DESC_STRMAX
,
"[%"
PRIu64
"]"
,
desc
->
psmx
);
"[%"
PRIu64
"]"
,
desc
->
psmx
);
if
(
s
<
0
||
s
>
MSTRO_EP_DESC_STRMAX
)
{
ERR
(
"Failed to write u64 address: %d (errno %d = %s)
\n
"
,
s
,
errno
,
strerror
(
errno
));
abort
();
}
service
[
0
]
=
'\0'
;
service
[
0
]
=
'\0'
;
break
;
break
;
case
MSTRO_EP_OFI_PSMX2
:
case
MSTRO_EP_OFI_PSMX2
:
snprintf
(
host
,
MSTRO_EP_DESC_STRMAX
,
s
=
snprintf
(
host
,
MSTRO_EP_DESC_STRMAX
,
"[%"
PRIu64
":%"
PRIu64
"]"
,
desc
->
psmx2
[
0
],
desc
->
psmx2
[
1
]);
"[%"
PRIu64
":%"
PRIu64
"]"
,
desc
->
psmx2
[
0
],
desc
->
psmx2
[
1
]);
if
(
s
<
0
||
s
>
MSTRO_EP_DESC_STRMAX
)
{
ERR
(
"Failed to write psmx2 address: %d (errno %d = %s)
\n
"
,
s
,
errno
,
strerror
(
errno
));
abort
();
}
service
[
0
]
=
'\0'
;
service
[
0
]
=
'\0'
;
break
;
break
;
case
MSTRO_EP_OFI_GNI
:
case
MSTRO_EP_OFI_GNI
:
snprintf
(
host
,
MSTRO_EP_DESC_STRMAX
,
s
=
snprintf
(
host
,
MSTRO_EP_DESC_STRMAX
,
"[%"
PRIu64
":%"
PRIu64
":%"
PRIu64
":%"
PRIu64
":%"
PRIu64
":%"
PRIu64
"/%s]"
,
"[%"
PRIu64
":%"
PRIu64
":%"
PRIu64
":%"
PRIu64
":%"
PRIu64
":%"
PRIu64
"/%s]"
,
desc
->
gni
[
0
],
desc
->
gni
[
1
],
desc
->
gni
[
0
],
desc
->
gni
[
1
],
desc
->
gni
[
2
],
desc
->
gni
[
3
],
desc
->
gni
[
2
],
desc
->
gni
[
3
],
desc
->
gni
[
4
],
desc
->
gni
[
5
],
desc
->
gni
[
4
],
desc
->
gni
[
5
],
desc
->
oob_cookie
);
desc
->
oob_cookie
);
if
(
s
<
0
||
s
>
MSTRO_EP_DESC_STRMAX
)
{
ERR
(
"Failed to write GNI address: %d (errno %d = %s)
\n
"
,
s
,
errno
,
strerror
(
errno
));
abort
();
}
service
[
0
]
=
'\0'
;
break
;
break
;
case
MSTRO_EP_OFI_STR
:
case
MSTRO_EP_OFI_STR
:
strcpy
(
host
,
desc
->
str
);
strcpy
(
host
,
desc
->
str
);
...
@@ -1055,9 +1082,14 @@ mstro_ep_desc_describe(mstro_endpoint_descriptor desc)
...
@@ -1055,9 +1082,14 @@ mstro_ep_desc_describe(mstro_endpoint_descriptor desc)
strcpy
(
host
,
"FIXME"
);
strcpy
(
host
,
"FIXME"
);
service
[
0
]
=
'\0'
;
service
[
0
]
=
'\0'
;
}
}
snprintf
(
buf
,
MSTRO_EP_DESC_STRMAX
,
"EPD type %d (%s) addr %s:%s"
,
s
=
snprintf
(
buf
,
MSTRO_EP_DESC_STRMAX
,
"EPD type %d (%s) addr %s:%s"
,
desc
->
type
,
mstro_ep_descriptor_names
[
desc
->
type
],
desc
->
type
,
mstro_ep_descriptor_names
[
desc
->
type
],
host
,
service
);
host
,
service
);
if
(
s
<
0
||
s
>
MSTRO_EP_DESC_STRMAX
)
{
ERR
(
"Failed to write endpoint description: %d (errno %d = %s)
\n
"
,
s
,
errno
,
strerror
(
errno
));
abort
();
}
desc
->
name
=
buf
;
desc
->
name
=
buf
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment