D10387.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10387.diff
View Options

	Index: head/sys/netinet/ip_icmp.c
	===================================================================
	--- head/sys/netinet/ip_icmp.c
	+++ head/sys/netinet/ip_icmp.c
	@@ -540,11 +540,10 @@
	ICMPSTAT_INC(icps_bmcastecho);
	break;
	}
	- icp->icmp_type = ICMP_ECHOREPLY;
	if (badport_bandlim(BANDLIM_ICMP_ECHO) < 0)
	goto freeit;
	- else
	- goto reflect;
	+ icp->icmp_type = ICMP_ECHOREPLY;
	+ goto reflect;

	case ICMP_TSTAMP:
	if (V_icmptstamprepl == 0)
	@@ -558,13 +557,12 @@
	ICMPSTAT_INC(icps_badlen);
	break;
	}
	+ if (badport_bandlim(BANDLIM_ICMP_TSTAMP) < 0)
	+ goto freeit;
	icp->icmp_type = ICMP_TSTAMPREPLY;
	icp->icmp_rtime = iptime();
	icp->icmp_ttime = icp->icmp_rtime; /* bogus, do later! */
	- if (badport_bandlim(BANDLIM_ICMP_TSTAMP) < 0)
	- goto freeit;
	- else
	- goto reflect;
	+ goto reflect;

	case ICMP_MASKREQ:
	if (V_icmpmaskrepl == 0)
	Index: head/sys/netinet6/udp6_usrreq.c
	===================================================================
	--- head/sys/netinet6/udp6_usrreq.c
	+++ head/sys/netinet6/udp6_usrreq.c
	@@ -104,9 +104,7 @@
	#include <netinet/in_systm.h>
	#include <netinet/in_var.h>
	#include <netinet/ip.h>
	-#include <netinet/ip_icmp.h>
	#include <netinet/ip6.h>
	-#include <netinet/icmp_var.h>
	#include <netinet/icmp6.h>
	#include <netinet/ip_var.h>
	#include <netinet/udp.h>
	@@ -481,8 +479,6 @@
	}
	if (V_udp_blackhole)
	goto badunlocked;
	- if (badport_bandlim(BANDLIM_ICMP6_UNREACH) < 0)
	- goto badunlocked;
	icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0);
	return (IPPROTO_DONE);
	}