summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-10-31 16:41:26 -0700
committerDavid S. Miller <davem@davemloft.net>2008-10-31 16:41:26 -0700
commit920da6923cf03c8a78fbaffa408f8ab37f6abfc1 (patch)
tree40b5c407d15f46920f1a66b6da5312654230ca4c
parentcbafe312ef4a263e9aa36786bc67e1e6d959872b (diff)
downloadlinux-3.10-920da6923cf03c8a78fbaffa408f8ab37f6abfc1.tar.gz
linux-3.10-920da6923cf03c8a78fbaffa408f8ab37f6abfc1.tar.bz2
linux-3.10-920da6923cf03c8a78fbaffa408f8ab37f6abfc1.zip
key: fix setkey(8) policy set breakage
Steps to reproduce: #/usr/sbin/setkey -f flush; spdflush; add 192.168.0.42 192.168.0.1 ah 24500 -A hmac-md5 "1234567890123456"; add 192.168.0.42 192.168.0.1 esp 24501 -E 3des-cbc "123456789012123456789012"; spdadd 192.168.0.42 192.168.0.1 any -P out ipsec esp/transport//require ah/transport//require; setkey: invalid keymsg length Policy dump will bail out with the same message after that. -recv(4, "\2\16\0\0\32\0\3\0\0\0\0\0\37\r\0\0\3\0\5\0\377 \0\0\2\0\0\0\300\250\0*\0"..., 32768, 0) = 208 +recv(4, "\2\16\0\0\36\0\3\0\0\0\0\0H\t\0\0\3\0\5\0\377 \0\0\2\0\0\0\300\250\0*\0"..., 32768, 0) = 208 Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/key/af_key.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index e55e0441e4d..3440a4637f0 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2075,7 +2075,6 @@ static int pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, in
req_size += socklen * 2;
} else {
size -= 2*socklen;
- socklen = 0;
}
rq = (void*)skb_put(skb, req_size);
pol->sadb_x_policy_len += req_size/8;