From 255c0a564fce8616a2ebc9e6d1c2d7370b1d6908 Mon Sep 17 00:00:00 2001 From: Arne Wiebalck Date: Fri, 7 Feb 2014 11:23:32 +0100 Subject: [PATCH] rx: initialize memory before use initialize sockaddr_in.sin_zero before using. cosmetic, might fix some compiler warnings. Change-Id: Ib9c4707373ca98742f6a5e28e60006499527fa38 Reviewed-on: http://gerrit.openafs.org/10816 Reviewed-by: D Brashear Tested-by: BuildBot --- src/rx/rx.c | 3 +++ src/rx/rx_packet.c | 4 ++++ src/rx/rx_user.c | 2 ++ 3 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/rx/rx.c b/src/rx/rx.c index 338e3a6..ce815a4 100644 --- a/src/rx/rx.c +++ b/src/rx/rx.c @@ -3494,6 +3494,7 @@ rxi_ReceivePacket(struct rx_packet *np, osi_socket socket, addr.sin_family = AF_INET; addr.sin_port = port; addr.sin_addr.s_addr = host; + memset(&addr.sin_zero, 0, sizeof(addr.sin_zero)); #ifdef STRUCT_SOCKADDR_HAS_SA_LEN addr.sin_len = sizeof(addr); #endif /* AFS_OSF_ENV */ @@ -6506,6 +6507,7 @@ rxi_NatKeepAliveEvent(struct rxevent *event, void *arg1, taddr.sin_family = AF_INET; taddr.sin_port = rx_PortOf(rx_PeerOf(conn)); taddr.sin_addr.s_addr = rx_HostOf(rx_PeerOf(conn)); + memset(&taddr.sin_zero, 0, sizeof(taddr.sin_zero)); #ifdef STRUCT_SOCKADDR_HAS_SA_LEN taddr.sin_len = sizeof(struct sockaddr_in); #endif @@ -7516,6 +7518,7 @@ MakeDebugCall(osi_socket socket, afs_uint32 remoteAddr, afs_uint16 remotePort, taddr.sin_family = AF_INET; taddr.sin_port = remotePort; taddr.sin_addr.s_addr = remoteAddr; + memset(&taddr.sin_zero, 0, sizeof(taddr.sin_zero)); #ifdef STRUCT_SOCKADDR_HAS_SA_LEN taddr.sin_len = sizeof(struct sockaddr_in); #endif diff --git a/src/rx/rx_packet.c b/src/rx/rx_packet.c index 827c875..4822a35 100644 --- a/src/rx/rx_packet.c +++ b/src/rx/rx_packet.c @@ -2078,6 +2078,7 @@ rxi_SendDebugPacket(struct rx_packet *apacket, osi_socket asocket, taddr.sin_family = AF_INET; taddr.sin_port = aport; taddr.sin_addr.s_addr = ahost; + memset(&taddr.sin_zero, 0, sizeof(taddr.sin_zero)); #ifdef STRUCT_SOCKADDR_HAS_SA_LEN taddr.sin_len = sizeof(struct sockaddr_in); #endif @@ -2178,6 +2179,7 @@ rxi_SendPacket(struct rx_call *call, struct rx_connection *conn, addr.sin_family = AF_INET; addr.sin_port = peer->port; addr.sin_addr.s_addr = peer->host; + memset(&addr.sin_zero, 0, sizeof(addr.sin_zero)); /* This stuff should be revamped, I think, so that most, if not * all, of the header stuff is always added here. We could @@ -2331,6 +2333,7 @@ rxi_SendPacketList(struct rx_call *call, struct rx_connection *conn, addr.sin_family = AF_INET; addr.sin_port = peer->port; addr.sin_addr.s_addr = peer->host; + memset(&addr.sin_zero, 0, sizeof(addr.sin_zero)); if (len + 1 > RX_MAXIOVECS) { osi_Panic("rxi_SendPacketList, len > RX_MAXIOVECS\n"); @@ -2536,6 +2539,7 @@ rxi_SendRawAbort(osi_socket socket, afs_uint32 host, u_short port, addr.sin_family = AF_INET; addr.sin_addr.s_addr = host; addr.sin_port = port; + memset(&addr.sin_zero, 0, sizeof(addr.sin_zero)); #ifdef STRUCT_SOCKADDR_HAS_SA_LEN addr.sin_len = sizeof(struct sockaddr_in); #endif diff --git a/src/rx/rx_user.c b/src/rx/rx_user.c index 942829b..598be2b 100644 --- a/src/rx/rx_user.c +++ b/src/rx/rx_user.c @@ -132,6 +132,7 @@ rxi_GetHostUDPSocket(u_int ahost, u_short port) taddr.sin_addr.s_addr = ahost; taddr.sin_family = AF_INET; taddr.sin_port = (u_short) port; + memset(&taddr.sin_zero, 0, sizeof(taddr.sin_zero)); #ifdef STRUCT_SOCKADDR_HAS_SA_LEN taddr.sin_len = sizeof(struct sockaddr_in); #endif @@ -724,6 +725,7 @@ rxi_InitPeerParams(struct rx_peer *pp) addr.sin_family = AF_INET; addr.sin_addr.s_addr = pp->host; addr.sin_port = pp->port; + memset(&addr.sin_zero, 0, sizeof(addr.sin_zero)); if (connect(sock, (struct sockaddr *)&addr, sizeof(addr)) == 0) { int mtu=0; socklen_t s = sizeof(mtu); -- 1.7.1