summaryrefslogtreecommitdiff
path: root/net/net.c
diff options
context:
space:
mode:
authorChris Packham <judge.packham@gmail.com>2018-11-26 21:00:29 +1300
committerJoe Hershberger <joe.hershberger@ni.com>2019-01-24 11:35:30 -0600
commit67bb984249442378ebb6a0eb68b6b0dd67dfbe72 (patch)
tree0a7d701e1fb79d59c7093d95a21d738027377e3e /net/net.c
parent1a4af5c562fdb9f5a884a53f136f2b2075ffd1d8 (diff)
net: remove CONFIG_MCAST_TFTP
No mainline board enables CONFIG_MCAST_TFTP and there have been compilation issues with the code for some time. Additionally, it has a potential buffer underrun issue (reported as a side note in CVE-2018-18439). Remove the multicast TFTP code but keep the driver API for the future addition of IPv6. Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com> Signed-off-by: Chris Packham <judge.packham@gmail.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'net/net.c')
-rw-r--r--net/net.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/net/net.c b/net/net.c
index e9f7a7d85e..58b0417cbe 100644
--- a/net/net.c
+++ b/net/net.c
@@ -131,10 +131,6 @@ struct in_addr net_dns_server;
struct in_addr net_dns_server2;
#endif
-#ifdef CONFIG_MCAST_TFTP /* Multicast TFTP */
-struct in_addr net_mcast_addr;
-#endif
-
/** END OF BOOTP EXTENTIONS **/
/* Our ethernet address */
@@ -1216,9 +1212,6 @@ void net_process_received_packet(uchar *in_packet, int len)
dst_ip = net_read_ip(&ip->ip_dst);
if (net_ip.s_addr && dst_ip.s_addr != net_ip.s_addr &&
dst_ip.s_addr != 0xFFFFFFFF) {
-#ifdef CONFIG_MCAST_TFTP
- if (net_mcast_addr != dst_ip)
-#endif
return;
}
/* Read source IP address for later use */