summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenis Vlasenko2008-04-29 12:31:53 +0000
committerDenis Vlasenko2008-04-29 12:31:53 +0000
commitb34266b42b5f6f78b7346c9ca90caebcd59db345 (patch)
tree4e040efe40ba8f35415eb4d3f4bf64ca20274956
parenta0c103a30a96e20794630c5daa4aad5926a151f2 (diff)
downloadbusybox-b34266b42b5f6f78b7346c9ca90caebcd59db345.zip
busybox-b34266b42b5f6f78b7346c9ca90caebcd59db345.tar.gz
ping: dont leak uninitialized data in ping packets
function old new delta sendping4 176 186 +10 sendping6 93 100 +7
-rw-r--r--networking/ping.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/networking/ping.c b/networking/ping.c
index 2991486..c3a7107 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -372,9 +372,10 @@ static void sendping4(int junk ATTRIBUTE_UNUSED)
* *after* packet. Saves one if() */
struct icmp *pkt = alloca(datalen + ICMP_MINLEN + 4);
+ memset(pkt, 0, datalen + ICMP_MINLEN + 4);
pkt->icmp_type = ICMP_ECHO;
- pkt->icmp_code = 0;
- pkt->icmp_cksum = 0;
+ /*pkt->icmp_code = 0;*/
+ /*pkt->icmp_cksum = 0;*/
pkt->icmp_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
pkt->icmp_id = myid;
@@ -391,9 +392,10 @@ static void sendping6(int junk ATTRIBUTE_UNUSED)
{
struct icmp6_hdr *pkt = alloca(datalen + sizeof(struct icmp6_hdr) + 4);
+ memset(pkt, 0, datalen + sizeof(struct icmp6_hdr) + 4);
pkt->icmp6_type = ICMP6_ECHO_REQUEST;
- pkt->icmp6_code = 0;
- pkt->icmp6_cksum = 0;
+ /*pkt->icmp6_code = 0;*/
+ /*pkt->icmp6_cksum = 0;*/
pkt->icmp6_seq = htons(ntransmitted); /* don't ++ here, it can be a macro */
pkt->icmp6_id = myid;