Skip to content

simplify use of sockaddr* structs to work around buffer overflow warning #968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2015
Merged

simplify use of sockaddr* structs to work around buffer overflow warning #968

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bfaa92
simplify use of sockaddr* structs to work around buffer overflow warning
JohnWestlund Oct 2, 2015
044fea8
re-order != comparison, OBJ_RELEASE mca_oob_tcp_addr_t on failure
JohnWestlund Oct 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions orte/mca/oob/tcp/oob_tcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ static void accept_connection(const int accepted_fd,
static int parse_uri(const uint16_t af_family,
const char* host,
const char *port,
struct sockaddr* inaddr)
struct sockaddr_storage* inaddr)
{
struct sockaddr_in *in;

Expand Down Expand Up @@ -260,7 +260,6 @@ static int parse_uri(const uint16_t af_family,
static void process_set_peer(int fd, short args, void *cbdata)
{
mca_oob_tcp_peer_op_t *pop = (mca_oob_tcp_peer_op_t*)cbdata;
struct sockaddr inaddr;
mca_oob_tcp_peer_t *peer;
int rc=ORTE_SUCCESS;
uint64_t *ui64 = (uint64_t*)(&pop->peer);
Expand Down Expand Up @@ -290,8 +289,10 @@ static void process_set_peer(int fd, short args, void *cbdata)
}
}

if ((rc = parse_uri(pop->af_family, pop->net, pop->port, (struct sockaddr*) &inaddr)) != ORTE_SUCCESS) {
maddr = OBJ_NEW(mca_oob_tcp_addr_t);
if (ORTE_SUCCESS != (rc = parse_uri(pop->af_family, pop->net, pop->port, (struct sockaddr_storage*) &(maddr->addr)))) {
ORTE_ERROR_LOG(rc);
OBJ_RELEASE(maddr);
goto cleanup;
}

Expand All @@ -301,8 +302,6 @@ static void process_set_peer(int fd, short args, void *cbdata)
ORTE_NAME_PRINT(&pop->peer),
(NULL == pop->net) ? "NULL" : pop->net,
(NULL == pop->port) ? "NULL" : pop->port);
maddr = OBJ_NEW(mca_oob_tcp_addr_t);
memcpy(&maddr->addr, &inaddr, sizeof(inaddr));
opal_list_append(&peer->addrs, &maddr->super);

cleanup:
Expand Down