[16/18] xfrm: Notify compat listeners about policy flush

Message ID	20180726023144.31066-17-dima@arista.com
State	Awaiting Upstream, archived
Delegated to:	David Miller
Headers	show Return-Path: <netdev-owner@vger.kernel.org> From: Dmitry Safonov <dima@arista.com> To: linux-kernel@vger.kernel.org Cc: Dmitry Safonov <dima@arista.com>, "David S. Miller" <davem@davemloft.net>, Herbert Xu <herbert@gondor.apana.org.au>, Steffen Klassert <steffen.klassert@secunet.com>, Dmitry Safonov <0x7f454c46@gmail.com>, netdev@vger.kernel.org Subject: [PATCH 16/18] xfrm: Notify compat listeners about policy flush Date: Thu, 26 Jul 2018 03:31:42 +0100 Message-Id: <20180726023144.31066-17-dima@arista.com> In-Reply-To: <20180726023144.31066-1-dima@arista.com> References: <20180726023144.31066-1-dima@arista.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk
Series	xfrm: Add compat layer \| expand [00/18] xfrm: Add compat layer [01/18] x86/compat: Adjust in_compat_syscall() to generic code under !COMPAT [02/18] compat: Cleanup in_compat_syscall() callers [03/18] selftest/net/xfrm: Add test for ipsec tunnel [04/18] net/xfrm: Add _packed types for compat users [05/18] net/xfrm: Parse userspi_info{,_packed} depending on syscall [06/18] netlink: Do not subscribe to non-existent groups [07/18] netlink: Pass groups pointer to .bind() [08/18] xfrm: Add in-kernel groups for compat notifications [09/18] xfrm: Dump usersa_info in compat/native formats [10/18] xfrm: Send state notifications in compat format too [11/18] xfrm: Add compat support for xfrm_user_expire messages [12/18] xfrm: Add compat support for xfrm_userpolicy_info messages [13/18] xfrm: Add compat support for xfrm_user_acquire messages [14/18] xfrm: Add compat support for xfrm_user_polexpire messages [15/18] xfrm: Check compat acquire listeners in xfrm_is_alive() [16/18] xfrm: Notify compat listeners about policy flush [17/18] xfrm: Notify compat listeners about state flush [18/18] xfrm: Enable compat syscalls

Message ID

20180726023144.31066-17-dima@arista.com

State

Awaiting Upstream, archived

Delegated to:

David Miller

Headers

From: Dmitry Safonov <dima@arista.com>
To: linux-kernel@vger.kernel.org
Cc: Dmitry Safonov <dima@arista.com>,
	"David S. Miller" <davem@davemloft.net>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	Steffen Klassert <steffen.klassert@secunet.com>,
	Dmitry Safonov <0x7f454c46@gmail.com>, netdev@vger.kernel.org
Subject: [PATCH 16/18] xfrm: Notify compat listeners about policy flush
Date: Thu, 26 Jul 2018 03:31:42 +0100
Message-Id: <20180726023144.31066-17-dima@arista.com>
In-Reply-To: <20180726023144.31066-1-dima@arista.com>
References: <20180726023144.31066-1-dima@arista.com>
Sender: netdev-owner@vger.kernel.org
Precedence: bulk

Series

xfrm: Add compat layer | expand

Commit Message

Dmitry Safonov July 26, 2018, 2:31 a.m. UTC

Notify two groups of listeners:
XFRMNLGRP_POLICY - applications that uses native UABI for messages;
XFRMNLGRP_COMPAT_POLICY - applications that uses compat UABI for messages;

Cc: "David S. Miller" <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: netdev@vger.kernel.org
Signed-off-by: Dmitry Safonov <dima@arista.com>
---
 net/xfrm/xfrm_user.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 752019963b1e..7bba0638c014 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -3368,7 +3368,8 @@  static int xfrm_notify_policy(struct xfrm_policy *xp, int dir,
 	return __xfrm_notify_policy(xp, dir, c, true);
 }
 
-static int xfrm_notify_policy_flush(const struct km_event *c)
+static int __xfrm_notify_policy_flush(const struct km_event *c,
+			unsigned int group)
 {
 	struct net *net = c->net;
 	struct nlmsghdr *nlh;
@@ -3389,13 +3390,22 @@  static int xfrm_notify_policy_flush(const struct km_event *c)
 
 	nlmsg_end(skb, nlh);
 
-	return xfrm_nlmsg_multicast(net, skb, 0, XFRMNLGRP_POLICY);
+	return xfrm_nlmsg_multicast(net, skb, 0, group);
 
 out_free_skb:
 	kfree_skb(skb);
 	return err;
 }
 
+static int xfrm_notify_policy_flush(const struct km_event *c)
+{
+	int ret = __xfrm_notify_policy_flush(c, XFRMNLGRP_POLICY);
+
+	if ((ret && ret != -ESRCH) || !IS_ENABLED(CONFIG_COMPAT))
+		return ret;
+	return __xfrm_notify_policy_flush(c, XFRMNLGRP_COMPAT_POLICY);
+}
+
 static int xfrm_send_policy_notify(struct xfrm_policy *xp, int dir, const struct km_event *c)
 {

[16/18] xfrm: Notify compat listeners about policy flush

Commit Message

Patch