diff mbox series

[17/18] xfrm: Notify compat listeners about state flush

Message ID 20180726023144.31066-18-dima@arista.com
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show
Series xfrm: Add compat layer | expand

Commit Message

Dmitry Safonov July 26, 2018, 2:31 a.m. UTC 
Notify two groups of listeners:
XFRMNLGRP_SA - applications that uses native UABI for messages;
XFRMNLGRP_COMPAT_SA - 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 | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 7bba0638c014..7e3a132b76fb 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2879,7 +2879,7 @@  static int xfrm_aevent_state_notify(struct xfrm_state *x, const struct km_event
 	return xfrm_nlmsg_multicast(net, skb, 0, XFRMNLGRP_AEVENTS);
 }
 
-static int xfrm_notify_sa_flush(const struct km_event *c)
+static int __xfrm_notify_sa_flush(const struct km_event *c, unsigned int group)
 {
 	struct net *net = c->net;
 	struct xfrm_usersa_flush *p;
@@ -2902,7 +2902,16 @@  static int xfrm_notify_sa_flush(const struct km_event *c)
 
 	nlmsg_end(skb, nlh);
 
-	return xfrm_nlmsg_multicast(net, skb, 0, XFRMNLGRP_SA);
+	return xfrm_nlmsg_multicast(net, skb, 0, group);
+}
+
+static int xfrm_notify_sa_flush(const struct km_event *c)
+{
+	int ret = __xfrm_notify_sa_flush(c, XFRMNLGRP_SA);
+
+	if ((ret && ret != -ESRCH) || !IS_ENABLED(CONFIG_COMPAT))
+		return ret;
+	return __xfrm_notify_sa_flush(c, XFRMNLGRP_COMPAT_SA);
 }
 
 static inline unsigned int xfrm_sa_len(struct xfrm_state *x)