[PATCH]: set state to XFRM_STATE_DEAD before calling xfrm_state_put

[Patrick McHardy]

This is a MIME-formatted message.  If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-646-1052924463-0001-2
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

This patch sets x->state to XFRM_STATE_DEAD before calling
xfrm_state_put in pfkey_msg2xfrm_state to avoid triggering
the BUG_TRAP in __xfrm_state_destroy. The patch applies to both
2.5 and the 2.4 backport.

Best regards,
Patrick

--=_courier-646-1052924463-0001-2
Content-Type: text/plain; name="af_key-set-xfrm-dead.diff"; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="af_key-set-xfrm-dead.diff"

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1113  -> 1.1114 
#	    net/key/af_key.c	1.35    -> 1.36   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/14	[e-mail]	1.1114
# [IPSEC]: set state to XFRM_STATE_DEAD before calling xfrm_state_put in pfkey_msg2xfrm_state
# --------------------------------------------
#
diff -Nru a/net/key/af_key.c b/net/key/af_key.c
--- a/net/key/af_key.c	Wed May 14 16:56:52 2003
+++ b/net/key/af_key.c	Wed May 14 16:56:52 2003
@@ -1090,6 +1090,7 @@
 	return x;
 
 out:
+	x->type = XFRM_STATE_DEAD;
 	xfrm_state_put(x);
 	return ERR_PTR(-ENOBUFS);
 }

--=_courier-646-1052924463-0001-2--