diff options
| author | Sam Leffler <sam@FreeBSD.org> | 2003-09-30 04:46:08 +0000 |
|---|---|---|
| committer | Sam Leffler <sam@FreeBSD.org> | 2003-09-30 04:46:08 +0000 |
| commit | b140bc1fc8dfeded04f2e7ffd6e13f198531c53e (patch) | |
| tree | e69e397b08ceb0859fe952a0aca6ef40dc00ff1d /sys/netinet6/ip6_output.c | |
| parent | 9afe34c1504a202b552587e0dcecc49cd3a3e380 (diff) | |
| download | src-b140bc1fc8dfeded04f2e7ffd6e13f198531c53e.tar.gz src-b140bc1fc8dfeded04f2e7ffd6e13f198531c53e.zip | |
Correct pfil_run_hooks return handling: if the return value is non-zero
then the mbuf has been consumed by a hook; otherwise beware of a null
mbuf return (gack). In particular the bridge was doing the wrong thing.
While in the ipv6 code make it's handling of pfil_run_hooks identical
to netbsd.
Pointed out by: Pyun YongHyeon <yongari@kt-is.co.kr>
Notes
Notes:
svn path=/head/; revision=120593
Diffstat (limited to 'sys/netinet6/ip6_output.c')
| -rw-r--r-- | sys/netinet6/ip6_output.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 7e81373787d7..e03fd3ba8ba4 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -926,11 +926,8 @@ skip_ipsec2:; /* * Run through list of hooks for output packets. */ - if (pfil_run_hooks(&inet6_pfil_hook, &m, ifp, PFIL_OUT) != 0) { - error = EHOSTUNREACH; - goto done; - } - if (m == NULL) + error = pfil_run_hooks(&inet6_pfil_hook, &m, ifp, PFIL_OUT); + if (error != 0 || m == NULL) goto done; ip6 = mtod(m, struct ip6_hdr *); #endif /* PFIL_HOOKS */ |