summaryrefslogtreecommitdiffstats
path: root/net/key
diff options
context:
space:
mode:
authorJamal Hadi Salim <hadi@cyberus.ca>2010-02-19 02:00:41 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-19 13:11:50 -0800
commit9e64cc9572b43afcbcd2d004538db435f2cd0587 (patch)
tree36ccf743338c97b407734f1cfb39b665dd3ce05d /net/key
parent8be987d73481831265d7e8c648bec838271bfd9b (diff)
downloadlinux-stable-9e64cc9572b43afcbcd2d004538db435f2cd0587.tar.gz
linux-stable-9e64cc9572b43afcbcd2d004538db435f2cd0587.tar.bz2
linux-stable-9e64cc9572b43afcbcd2d004538db435f2cd0587.zip
xfrm: Flushing empty SAD generates false events
To see the effect make sure you have an empty SAD. On window1 "ip xfrm mon" and on window2 issue "ip xfrm state flush" You get prompt back in window2 and you see the flush event on window1. With this fix, you still get prompt on window1 but no event on window2. Thanks to Alexey Dobriyan for finding a bug in earlier version when using pfkey to do the flushing. Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/key')
-rw-r--r--net/key/af_key.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index b3faede9a4f6..c269ce6094d6 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1768,8 +1768,11 @@ static int pfkey_flush(struct sock *sk, struct sk_buff *skb, struct sadb_msg *hd
audit_info.secid = 0;
err = xfrm_state_flush(net, proto, &audit_info);
err2 = unicast_flush_resp(sk, hdr);
- if (err || err2)
+ if (err || err2) {
+ if (err == -ESRCH) /* empty table - go quietly */
+ err = 0;
return err ? err : err2;
+ }
c.data.proto = proto;
c.seq = hdr->sadb_msg_seq;