diff options
| author | ae <ae@FreeBSD.org> | 2014-04-07 12:58:54 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2014-04-07 12:58:54 +0000 |
| commit | d32682111b73a8795016f1dd6d34ceb40cc6afe2 (patch) | |
| tree | 9ceb99eb1b8cd90b3c593f7005589ea4620f543a /sys/netinet6 | |
| parent | 92efc4b6230fb68b552d1d367888de19b874a6e6 (diff) | |
| download | FreeBSD-src-d32682111b73a8795016f1dd6d34ceb40cc6afe2.zip FreeBSD-src-d32682111b73a8795016f1dd6d34ceb40cc6afe2.tar.gz | |
MFC r263969,263971:
Don't generate an ICMPv6 error message if packet was consumed by filter.
Remove unused label.
Sponsored by: Yandex LLC
Diffstat (limited to 'sys/netinet6')
| -rw-r--r-- | sys/netinet6/ip6_forward.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c index 2cc2741..95aba93 100644 --- a/sys/netinet6/ip6_forward.c +++ b/sys/netinet6/ip6_forward.c @@ -563,10 +563,8 @@ skip_routing: odst = ip6->ip6_dst; /* Run through list of hooks for output packets. */ error = pfil_run_hooks(&V_inet6_pfil_hook, &m, rt->rt_ifp, PFIL_OUT, NULL); - if (error != 0) - goto senderr; - if (m == NULL) - goto freecopy; + if (error != 0 || m == NULL) + goto freecopy; /* consumed by filter */ ip6 = mtod(m, struct ip6_hdr *); /* See if destination IP address was changed by packet filter. */ @@ -635,7 +633,6 @@ pass: } } -senderr: if (mcopy == NULL) goto out; switch (error) { |
