From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Safonov Subject: [PATCH 17/18] xfrm: Notify compat listeners about state flush Date: Thu, 26 Jul 2018 03:31:43 +0100 Message-ID: <20180726023144.31066-18-dima@arista.com> References: <20180726023144.31066-1-dima@arista.com> Cc: Dmitry Safonov , "David S. Miller" , Herbert Xu , Steffen Klassert , Dmitry Safonov <0x7f454c46@gmail.com>, netdev@vger.kernel.org To: linux-kernel@vger.kernel.org Return-path: In-Reply-To: <20180726023144.31066-1-dima@arista.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org 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" Cc: Herbert Xu Cc: Steffen Klassert Cc: netdev@vger.kernel.org Signed-off-by: Dmitry Safonov --- net/xfrm/xfrm_user.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) 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) -- 2.13.6