Author: ae
Date: Tue Apr 28 09:29:28 2015
New Revision: 282132
URL: https://svnweb.freebsd.org/changeset/base/282132
Log:
Since PFIL can change mbuf pointer, we should update pointers after
calling ipsec_filter().
Sponsored by: Yandex LLC
Modified:
head/sys/netipsec/ipsec_input.c
head/sys/netipsec/ipsec_output.c
Modified: head/sys/netipsec/ipsec_input.c
==============================================================================
--- head/sys/netipsec/ipsec_input.c Tue Apr 28 09:19:40 2015
(r282131)
+++ head/sys/netipsec/ipsec_input.c Tue Apr 28 09:29:28 2015
(r282132)
@@ -391,6 +391,7 @@ ipsec4_common_input_cb(struct mbuf *m, s
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 */
Modified: head/sys/netipsec/ipsec_output.c
==============================================================================
--- head/sys/netipsec/ipsec_output.c Tue Apr 28 09:19:40 2015
(r282131)
+++ head/sys/netipsec/ipsec_output.c Tue Apr 28 09:29:28 2015
(r282132)
@@ -578,6 +578,7 @@ ipsec4_process_packet(struct mbuf *m, st
/* 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, st
/* 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 */
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
