diff options
| author | ae <ae@FreeBSD.org> | 2015-04-28 09:29:28 +0000 |
|---|---|---|
| committer | ae <ae@FreeBSD.org> | 2015-04-28 09:29:28 +0000 |
| commit | b9d4da35fafa515f4a572c0e36e44613383a277f (patch) | |
| tree | d7c63f48146300a18c0d0f836d256d80beaf7dba /sys/netipsec | |
| parent | 70befe4134fd1eb44b97a7fecb015917c4bcde77 (diff) | |
| download | FreeBSD-src-b9d4da35fafa515f4a572c0e36e44613383a277f.zip FreeBSD-src-b9d4da35fafa515f4a572c0e36e44613383a277f.tar.gz | |
Since PFIL can change mbuf pointer, we should update pointers after
calling ipsec_filter().
Sponsored by: Yandex LLC
Diffstat (limited to 'sys/netipsec')
| -rw-r--r-- | sys/netipsec/ipsec_input.c | 1 | ||||
| -rw-r--r-- | sys/netipsec/ipsec_output.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index 6c52781..5837699 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -391,6 +391,7 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, int skip, ipsec_bpf(m, sav, AF_INET, ENC_IN|ENC_BEFORE); if ((error = ipsec_filter(&m, PFIL_IN, ENC_IN|ENC_BEFORE)) != 0) return (error); + ip = mtod(m, struct ip *); #endif /* DEV_ENC */ /* IP-in-IP encapsulation */ diff --git a/sys/netipsec/ipsec_output.c b/sys/netipsec/ipsec_output.c index 22a50c4..c08ac3a 100644 --- a/sys/netipsec/ipsec_output.c +++ b/sys/netipsec/ipsec_output.c @@ -578,6 +578,7 @@ ipsec4_process_packet(struct mbuf *m, struct ipsecrequest *isr) /* pass the mbuf to enc0 for packet filtering */ if ((error = ipsec_filter(&m, PFIL_OUT, ENC_OUT|ENC_BEFORE)) != 0) goto bad; + ip = mtod(m, struct ip *); #endif /* Do the appropriate encapsulation, if necessary */ if (isr->saidx.mode == IPSEC_MODE_TUNNEL || /* Tunnel requ'd */ @@ -699,6 +700,7 @@ ipsec6_process_packet(struct mbuf *m, struct ipsecrequest *isr) /* pass the mbuf to enc0 for packet filtering */ if ((error = ipsec_filter(&m, PFIL_OUT, ENC_OUT|ENC_BEFORE)) != 0) goto bad; + ip6 = mtod(m, struct ip6_hdr *); #endif /* DEV_ENC */ /* Do the appropriate encapsulation, if necessary */ |
