emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

udhcpc[6]: initialize entire sockaddr_ll

Browse Source 
I see random field values like sll_hatype=0x267 when I strace.
They seem to not matter, but just in case they sometimes do,
let's at least have deterministic values (via memset(0)).

function                                             old     new   delta
change_listen_mode                                   308     322     +14

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-09-29 14:09:02 +02:00
parent 0c4dbd481a
commit 2b9acc60c0
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
networking/udhcp/d6_dhcpc.c
View File

@ -881,9 +881,14 @@ static int d6_raw_socket(int ifindex)
fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IPV6)); fd = xsocket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IPV6));
log2("got raw socket fd %d", fd); log2("got raw socket fd %d", fd);
memset(&sock, 0, sizeof(sock)); /* let's be deterministic */
sock.sll_family = AF_PACKET; sock.sll_family = AF_PACKET;
sock.sll_protocol = htons(ETH_P_IPV6); sock.sll_protocol = htons(ETH_P_IPV6);
sock.sll_ifindex = ifindex; sock.sll_ifindex = ifindex;
/*sock.sll_hatype = ARPHRD_???;*/
/*sock.sll_pkttype = PACKET_???;*/
/*sock.sll_halen = ???;*/
/*sock.sll_addr[8] = ???;*/
xbind(fd, (struct sockaddr *) &sock, sizeof(sock)); xbind(fd, (struct sockaddr *) &sock, sizeof(sock));
#if 0 #if 0

2
networking/udhcp/d6_packet.c
View File

@ -75,6 +75,8 @@ int FAST_FUNC d6_send_raw_packet(
dest_sll.sll_family = AF_PACKET; dest_sll.sll_family = AF_PACKET;
dest_sll.sll_protocol = htons(ETH_P_IPV6); dest_sll.sll_protocol = htons(ETH_P_IPV6);
dest_sll.sll_ifindex = ifindex; dest_sll.sll_ifindex = ifindex;
/*dest_sll.sll_hatype = ARPHRD_???;*/
/*dest_sll.sll_pkttype = PACKET_???;*/
dest_sll.sll_halen = 6; dest_sll.sll_halen = 6;
memcpy(dest_sll.sll_addr, dest_arp, 6); memcpy(dest_sll.sll_addr, dest_arp, 6);

5
networking/udhcp/dhcpc.c
View File

@ -1010,9 +1010,14 @@ static int udhcp_raw_socket(int ifindex)
*/ */
log2("got raw socket fd"); log2("got raw socket fd");
memset(&sock, 0, sizeof(sock)); /* let's be deterministic */
sock.sll_family = AF_PACKET; sock.sll_family = AF_PACKET;
sock.sll_protocol = htons(ETH_P_IP); sock.sll_protocol = htons(ETH_P_IP);
sock.sll_ifindex = ifindex; sock.sll_ifindex = ifindex;
/*sock.sll_hatype = ARPHRD_???;*/
/*sock.sll_pkttype = PACKET_???;*/
/*sock.sll_halen = ???;*/
/*sock.sll_addr[8] = ???;*/
xbind(fd, (struct sockaddr *) &sock, sizeof(sock)); xbind(fd, (struct sockaddr *) &sock, sizeof(sock));
#if 0 /* Several users reported breakage when BPF filter is used */ #if 0 /* Several users reported breakage when BPF filter is used */

2
networking/udhcp/packet.c
View File

@ -129,6 +129,8 @@ int FAST_FUNC udhcp_send_raw_packet(struct dhcp_packet *dhcp_pkt,
dest_sll.sll_family = AF_PACKET; dest_sll.sll_family = AF_PACKET;
dest_sll.sll_protocol = htons(ETH_P_IP); dest_sll.sll_protocol = htons(ETH_P_IP);
dest_sll.sll_ifindex = ifindex; dest_sll.sll_ifindex = ifindex;
/*dest_sll.sll_hatype = ARPHRD_???;*/
/*dest_sll.sll_pkttype = PACKET_???;*/
dest_sll.sll_halen = 6; dest_sll.sll_halen = 6;
memcpy(dest_sll.sll_addr, dest_arp, 6); memcpy(dest_sll.sll_addr, dest_arp, 6);