Date: Mon, 31 Mar 2014 14:27:23 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r263969 - head/sys/netinet6 Message-ID: <201403311427.s2VERNXP020550@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Mon Mar 31 14:27:22 2014 New Revision: 263969 URL: http://svnweb.freebsd.org/changeset/base/263969 Log: Don't generate an ICMPv6 error message if packet was consumed by filter. MFC after: 1 week Sponsored by: Yandex LLC Modified: head/sys/netinet6/ip6_forward.c Modified: head/sys/netinet6/ip6_forward.c ============================================================================== --- head/sys/netinet6/ip6_forward.c Mon Mar 31 14:12:27 2014 (r263968) +++ head/sys/netinet6/ip6_forward.c Mon Mar 31 14:27:22 2014 (r263969) @@ -564,10 +564,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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403311427.s2VERNXP020550>