From patchwork Fri Feb 19 12:00:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jamal X-Patchwork-Id: 45850 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7CBA3B7CEC for ; Fri, 19 Feb 2010 23:01:17 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752311Ab0BSMBF (ORCPT ); Fri, 19 Feb 2010 07:01:05 -0500 Received: from qw-out-2122.google.com ([74.125.92.27]:23182 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751152Ab0BSMA7 (ORCPT ); Fri, 19 Feb 2010 07:00:59 -0500 Received: by qw-out-2122.google.com with SMTP id 8so171666qwh.37 for ; Fri, 19 Feb 2010 04:00:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:to:cc:subject :date:message-id:x-mailer:in-reply-to:references; bh=F3FYqM4Xju2Zszrx0KRcN2Si+z6Z5Sb/G/26FPoeX7w=; b=GblTnhIR9thmE3WKdFgf3RjIt+66vdUU31v0cUT61ust1m0gAPz/Q1uamPcRMiMC07 7et+1csktn15wOV0mm9LBWYmWhjBS1iU53l/cPA/Bfzxpch01eWQ1odC+YgD66diQqlz AXamSxZKHNrcHu65eiiP2K1z2gTNocqrFjQqU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=W/QKyH8ypaTGbFRo6VQd+oOTRq/tWjHJIHNpHAyPWXbZ7zMYpOl3jJU9wbkjGLl/tC izn//Ry9k9SMvXn+GxC5uQjvrkWgN9g1mgGof72D5KDXKjwulEZjJSHC1Q89QJx/8axM i5eeGJh5HXHQKeNUjsttgW35zTaupCLeUR7Y8= Received: by 10.224.26.224 with SMTP id f32mr3277478qac.292.1266580858537; Fri, 19 Feb 2010 04:00:58 -0800 (PST) Received: from localhost.localdomain (CPE0030ab124d2f-CM001bd7a7f1a0.cpe.net.cable.rogers.com [99.240.66.42]) by mx.google.com with ESMTPS id 5sm146673qwg.28.2010.02.19.04.00.57 (version=SSLv3 cipher=RC4-MD5); Fri, 19 Feb 2010 04:00:57 -0800 (PST) From: jamal To: davem@davemloft.net, adobriyan@gmail.com Cc: netdev@vger.kernel.org, Jamal Hadi Salim Subject: [PATCH 2/3] xfrm: Flushing empty SAD generates false events Date: Fri, 19 Feb 2010 07:00:41 -0500 Message-Id: <1266580842-10608-3-git-send-email-hadi@cyberus.ca> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1266580842-10608-2-git-send-email-hadi@cyberus.ca> References: <1266580842-10608-1-git-send-email-hadi@cyberus.ca> <1266580842-10608-2-git-send-email-hadi@cyberus.ca> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jamal Hadi Salim 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 --- net/key/af_key.c | 5 ++++- net/xfrm/xfrm_state.c | 8 ++++++-- net/xfrm/xfrm_user.c | 5 ++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/net/key/af_key.c b/net/key/af_key.c index b3faede..c269ce6 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; diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index c9d6a5f..9fa3322 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..cd94a9d 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1524,8 +1524,11 @@ static int xfrm_flush_sa(struct sk_buff *skb, struct nlmsghdr *nlh, audit_info.sessionid = NETLINK_CB(skb).sessionid; audit_info.secid = NETLINK_CB(skb).sid; err = xfrm_state_flush(net, p->proto, &audit_info); - if (err) + if (err) { + if (err == -ESRCH) /* empty table */ + return 0; return err; + } c.data.proto = p->proto; c.event = nlh->nlmsg_type; c.seq = nlh->nlmsg_seq;