From: David S. Miller <davem@sunset.davemloft.net>
Date: Wed, 18 Apr 2007 04:48:10 +0000 (-0700)
Subject: [IPSEC] af_key: Fix thinko in pfkey_xfrm_policy2msg()
X-Git-Tag: v2.6.21~61
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fefaa75e0451c76225863644be01e4fd70884153;p=linux-2.6-omap-h63xx.git

[IPSEC] af_key: Fix thinko in pfkey_xfrm_policy2msg()

Make sure to actually assign the determined mode to
rq->sadb_x_ipsecrequest_mode.

Noticed by Joe Perches.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/key/af_key.c b/net/key/af_key.c
index cf77930ee51..345019345f0 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2072,7 +2072,7 @@ static int pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, in
 		rq->sadb_x_ipsecrequest_proto = t->id.proto;
 		if ((mode = pfkey_mode_from_xfrm(t->mode)) < 0)
 			return -EINVAL;
-		mode = pfkey_mode_from_xfrm(t->mode);
+		rq->sadb_x_ipsecrequest_mode = mode;
 		rq->sadb_x_ipsecrequest_level = IPSEC_LEVEL_REQUIRE;
 		if (t->reqid)
 			rq->sadb_x_ipsecrequest_level = IPSEC_LEVEL_UNIQUE;