* [PATCH]xfrm: Flushing empty SAD generates false events
@ 2010-02-11 9:51 jamal
2010-02-16 5:54 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: jamal @ 2010-02-11 9:51 UTC (permalink / raw)
To: David Miller, Herbert Xu; +Cc: netdev
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
To see the effect make sure you have an empty SAD.
-On window1 "ip xfrm mon"
-on window2 issue "ip xfrm state flush"
You get prompt back in window1
and you see the flush event on window2.
With this fix, you still get prompt on window1 but no
event on window2.
I was tempted to return -ESRCH on window1 (which would
show "RTNETLINK answers: No such process") but didnt want
to change current behavior.
cheers,
jamal
[-- Attachment #2: SAD-flush-ev --]
[-- Type: text/plain, Size: 2313 bytes --]
commit 5f3dd4a772326166e1bcf54acc2391df00dc7ab5
Author: Jamal Hadi Salim <hadi@cyberus.ca>
Date: Thu Feb 11 04:41:36 2010 -0500
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 window1 and you see the flush event on window2.
With this fix, you still get prompt on window1 but no event on window2.
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 76fa6fe..0f53e60 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -1751,7 +1751,7 @@ 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);
if (err)
- return err;
+ return 0;
c.data.proto = proto;
c.seq = hdr->sadb_msg_seq;
c.pid = hdr->sadb_msg_pid;
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index b36cc34..f50ee9b 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -603,13 +603,14 @@ xfrm_state_flush_secctx_check(struct net *net, u8 proto, struct xfrm_audit *audi
int xfrm_state_flush(struct net *net, u8 proto, struct xfrm_audit *audit_info)
{
- int i, err = 0;
+ int i, err = 0, cnt = 0;
spin_lock_bh(&xfrm_state_lock);
err = xfrm_state_flush_secctx_check(net, proto, audit_info);
if (err)
goto out;
+ err = -ESRCH;
for (i = 0; i <= net->xfrm.state_hmask; i++) {
struct hlist_node *entry;
struct xfrm_state *x;
@@ -626,13 +627,16 @@ restart:
audit_info->sessionid,
audit_info->secid);
xfrm_state_put(x);
+ if (!err)
+ cnt++;
spin_lock_bh(&xfrm_state_lock);
goto restart;
}
}
}
- err = 0;
+ if (cnt)
+ err = 0;
out:
spin_unlock_bh(&xfrm_state_lock);
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 943c871..7c87004 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1525,7 +1525,7 @@ static int xfrm_flush_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
audit_info.secid = NETLINK_CB(skb).sid;
err = xfrm_state_flush(net, p->proto, &audit_info);
if (err)
- return err;
+ return 0;
c.data.proto = p->proto;
c.event = nlh->nlmsg_type;
c.seq = nlh->nlmsg_seq;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH]xfrm: Flushing empty SAD generates false events
2010-02-11 9:51 [PATCH]xfrm: Flushing empty SAD generates false events jamal
@ 2010-02-16 5:54 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-02-16 5:54 UTC (permalink / raw)
To: hadi; +Cc: herbert, netdev
From: jamal <hadi@cyberus.ca>
Date: Thu, 11 Feb 2010 04:51:27 -0500
> 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 window1 and you see the flush event on window2.
> With this fix, you still get prompt on window1 but no event on window2.
>
> Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Applied to net-next-2.6
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-16 5:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-11 9:51 [PATCH]xfrm: Flushing empty SAD generates false events jamal
2010-02-16 5:54 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.