svn commit: r207652 - head/sys/netipsec

[VANHULLEBUS Yvan]

Author: vanhu
Date: Wed May  5 08:58:58 2010
New Revision: 207652
URL: http://svn.freebsd.org/changeset/base/207652

Log:
  Set SA's natt_type before calling key_mature() in key_add(),
  as the SA may be used as soon as key_mature() has been done.
  
  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:55:26 2010	(r207651)
+++ head/sys/netipsec/key.c	Wed May  5 08:58:58 2010	(r207652)
@@ -5422,12 +5422,6 @@ key_add(so, m, mhp)
 		return key_senderror(so, m, error);
 	}
 
-	/* check SA values to be mature. */
-	if ((error = key_mature(newsav)) != 0) {
-		KEY_FREESAV(&newsav);
-		return key_senderror(so, m, error);
-	}
-
 #ifdef IPSEC_NAT_T
 	/*
 	 * Handle more NAT-T info if present,
@@ -5447,6 +5441,12 @@ key_add(so, m, mhp)
 #endif
 #endif
 
+	/* check SA values to be mature. */
+	if ((error = key_mature(newsav)) != 0) {
+		KEY_FREESAV(&newsav);
+		return key_senderror(so, m, error);
+	}
+
 	/*
 	 * don't call key_freesav() here, as we would like to keep the SA
 	 * in the database on success.