Skip to content

Commit

Permalink
Ensure we never read uninitialized memory when handling sockaddr (#13346
Browse files Browse the repository at this point in the history
)

Motivation:

We should init the struct to ensure we not end up reading uninitialized memory

Modifications:

Assign to 0

Result:

No more reading of uninit memory
  • Loading branch information
normanmaurer committed Apr 21, 2023
1 parent f2eca0f commit c1f8cb0
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions transport-native-unix-common/src/main/c/netty_unix_socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@ static jint netty_unix_socket_accept(JNIEnv* env, jclass clazz, jint fd, jbyteAr
}

static jbyteArray netty_unix_socket_remoteAddress(JNIEnv* env, jclass clazz, jint fd) {
struct sockaddr_storage addr;
struct sockaddr_storage addr = { 0 };
socklen_t len = sizeof(addr);
if (getpeername(fd, (struct sockaddr*) &addr, &len) == -1) {
return NULL;
Expand All @@ -684,7 +684,7 @@ static jbyteArray netty_unix_socket_remoteAddress(JNIEnv* env, jclass clazz, jin
}

static jbyteArray netty_unix_socket_remoteDomainSocketAddress(JNIEnv* env, jclass clazz, jint fd) {
struct sockaddr_storage addr;
struct sockaddr_storage addr = { 0 };
socklen_t len = sizeof(addr);
if (getpeername(fd, (struct sockaddr*) &addr, &len) == -1) {
return NULL;
Expand All @@ -693,7 +693,7 @@ static jbyteArray netty_unix_socket_remoteDomainSocketAddress(JNIEnv* env, jclas
}

static jbyteArray netty_unix_socket_localAddress(JNIEnv* env, jclass clazz, jint fd) {
struct sockaddr_storage addr;
struct sockaddr_storage addr = { 0 };
socklen_t len = sizeof(addr);
if (getsockname(fd, (struct sockaddr*) &addr, &len) == -1) {
return NULL;
Expand All @@ -702,7 +702,7 @@ static jbyteArray netty_unix_socket_localAddress(JNIEnv* env, jclass clazz, jint
}

static jbyteArray netty_unix_socket_localDomainSocketAddress(JNIEnv* env, jclass clazz, jint fd) {
struct sockaddr_storage addr;
struct sockaddr_storage addr = { 0 };
socklen_t len = sizeof(addr);
if (getsockname(fd, (struct sockaddr*) &addr, &len) == -1) {
return NULL;
Expand Down

0 comments on commit c1f8cb0

Please sign in to comment.