summaryrefslogtreecommitdiffstats
path: root/net/key
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-03-27 14:07:04 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-27 14:07:04 -0400
commit0fb031f036385af1e1de87ac3e98a2afba2139ae (patch)
tree78a2afe0afa772fc1847e1ad486ef950ab8cfa73 /net/key
parent24f11a5cf538a8fcc10d61f457e9a2094fb965b4 (diff)
parent799ef90c55e692e096d8bd9e5871b95264b1e9ba (diff)
downloadop-kernel-dev-0fb031f036385af1e1de87ac3e98a2afba2139ae.zip
op-kernel-dev-0fb031f036385af1e1de87ac3e98a2afba2139ae.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
Steffen Klassert says: ==================== 1) Initialize the satype field in key_notify_policy_flush(), this was left uninitialized. From Nicolas Dichtel. 2) The sequence number difference for replay notifications was misscalculated on ESN sequence number wrap. We need a separate replay notify function for esn. 3) Fix an off by one in the esn replay notify function. From Mathias Krause. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
-rw-r--r--net/key/af_key.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 8555f33..5b1e5af 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2693,6 +2693,7 @@ static int key_notify_policy_flush(const struct km_event *c)
hdr->sadb_msg_pid = c->portid;
hdr->sadb_msg_version = PF_KEY_V2;
hdr->sadb_msg_errno = (uint8_t) 0;
+ hdr->sadb_msg_satype = SADB_SATYPE_UNSPEC;
hdr->sadb_msg_len = (sizeof(struct sadb_msg) / sizeof(uint64_t));
pfkey_broadcast(skb_out, GFP_ATOMIC, BROADCAST_ALL, NULL, c->net);
return 0;
OpenPOWER on IntegriCloud