Author: vanhu
Date: Wed May 5 08:55:26 2010
New Revision: 207651
URL: http://svn.freebsd.org/changeset/base/207651
Log:
Update SA's NAT-T stuff before calling key_mature() in key_update(),
as SA may be used as soon as key_mature() has been called.
Obtained from: NETASQ
MFC after: 1 week
Modified:
head/sys/netipsec/key.c
Modified: head/sys/netipsec/key.c
==============================================================================
--- head/sys/netipsec/key.c Wed May 5 08:43:47 2010 (r207650)
+++ head/sys/netipsec/key.c Wed May 5 08:55:26 2010 (r207651)
@@ -5156,12 +5156,6 @@ key_update(so, m, mhp)
return key_senderror(so, m, error);
}
- /* check SA values to be mature. */
- if ((mhp->msg->sadb_msg_errno = key_mature(sav)) != 0) {
- KEY_FREESAV(&sav);
- return key_senderror(so, m, 0);
- }
-
#ifdef IPSEC_NAT_T
/*
* Handle more NAT-T info if present,
@@ -5188,6 +5182,12 @@ key_update(so, m, mhp)
#endif
#endif
+ /* check SA values to be mature. */
+ if ((mhp->msg->sadb_msg_errno = key_mature(sav)) != 0) {
+ KEY_FREESAV(&sav);
+ return key_senderror(so, m, 0);
+ }
+
{
struct mbuf *n;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
