Skip to content
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

Sets uninitialized socket file descriptors to -1 #248

Merged
merged 2 commits into from
Jan 17, 2025
Merged

Sets uninitialized socket file descriptors to -1 #248

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0cafca
Sets uninitialized socket file descriptors to -1
italo-sampaio Jan 9, 2025
355ff20
Changes after code review
italo-sampaio Jan 17, 2025
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
45 changes: 22 additions & 23 deletions firmware/src/sgx/src/untrusted/io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,34 +43,41 @@ int serverfd;
int connfd;
struct sockaddr_in servaddr, cliaddr;

static void close_and_reset_fd(int *fd) {
if (fd && (*fd != -1)) {
close(*fd);
*fd = -1;
}
}

static int start_server(int port, const char *host) {
int sockfd;
struct hostent *hostinfo;
hostinfo = gethostbyname(host);

if (hostinfo == NULL) {
LOG("Host not found.\n");
return 0;
return -1;
}

// socket create and verification
sockfd = socket(AF_INET, SOCK_STREAM, 0);
if (sockfd == -1) {
LOG("Socket creation failed...\n");
return 0;
return -1;
}

explicit_bzero(&servaddr, sizeof(servaddr));

if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &(int){1}, sizeof(int)) <
0) {
LOG("Socket option setting failed failed\n");
return 0;
return -1;
}

if (setsockopt(sockfd, SOL_TCP, TCP_NODELAY, &(int){1}, sizeof(int)) < 0) {
LOG("Socket option setting failed failed\n");
return 0;
return -1;
}

// Set address and port
Expand All @@ -81,13 +88,13 @@ static int start_server(int port, const char *host) {
// Binding newly created socket to given IP and verification
if ((bind(sockfd, (struct sockaddr *)&servaddr, sizeof(servaddr))) != 0) {
LOG("Socket bind failed...\n");
return 0;
return -1;
}

// Now server is ready to listen and verification
if ((listen(sockfd, 5)) != 0) {
LOG("Listen failed...\n");
return 0;
return -1;
}

LOG("Server listening...\n");
Expand All @@ -107,20 +114,14 @@ static bool accept_connection() {
}

bool io_init(int port, const char *host) {
connfd = 0;
connfd = -1;
serverfd = start_server(port, host);
return serverfd;
return (serverfd != -1);
}

void io_finalise() {
if (connfd) {
close(connfd);
connfd = 0;
}
if (serverfd) {
close(serverfd);
serverfd = 0;
}
close_and_reset_fd(&connfd);
close_and_reset_fd(&serverfd);
}

unsigned short io_exchange(unsigned short tx) {
Expand All @@ -129,7 +130,7 @@ unsigned short io_exchange(unsigned short tx) {
int readlen;

while (true) {
if (!connfd) {
if (connfd == -1) {
if (!accept_connection()) {
LOG("Error accepting client connection\n");
return 0;
Expand All @@ -146,13 +147,13 @@ unsigned short io_exchange(unsigned short tx) {
tx_net = htonl(tx_net);
if (send(connfd, &tx_net, sizeof(tx_net), MSG_NOSIGNAL) == -1) {
LOG("Connection closed by the client\n");
connfd = 0;
close_and_reset_fd(&connfd);
continue;
}
// Write APDU
if (send(connfd, io_apdu_buffer, tx, MSG_NOSIGNAL) == -1) {
LOG("Connection closed by the client\n");
connfd = 0;
close_and_reset_fd(&connfd);
continue;
}
LOG_HEX("I/O =>", io_apdu_buffer, tx);
Expand All @@ -172,8 +173,7 @@ unsigned short io_exchange(unsigned short tx) {
"Disconnected\n",
readlen,
rx);
close(connfd);
connfd = 0;
close_and_reset_fd(&connfd);
continue;
}
LOG_HEX("I/O <=", io_apdu_buffer, rx);
Expand All @@ -196,7 +196,6 @@ unsigned short io_exchange(unsigned short tx) {
readlen,
sizeof(rx_net));
}
close(connfd);
connfd = 0;
close_and_reset_fd(&connfd);
}
}