diff options
| author | Florian Westphal <fw@strlen.de> | 2018-06-25 14:00:07 +0200 |
|---|---|---|
| committer | Steffen Klassert <steffen.klassert@secunet.com> | 2018-06-25 16:43:36 +0200 |
| commit | 86126b77dcd551ce223e7293bb55854e3df05646 (patch) | |
| tree | 2008dc902f74a3f7fe026df3f6e8dd5584df2f61 /net/xfrm | |
| parent | 8cc88773855f988d6a3bbf102bbd9dd9c828eb81 (diff) | |
| download | linux-86126b77dcd551ce223e7293bb55854e3df05646.tar.gz linux-86126b77dcd551ce223e7293bb55854e3df05646.tar.bz2 linux-86126b77dcd551ce223e7293bb55854e3df05646.zip | |
xfrm: free skb if nlsk pointer is NULL
nlmsg_multicast() always frees the skb, so in case we cannot call
it we must do that ourselves.
Fixes: 21ee543edc0dea ("xfrm: fix race between netns cleanup and state expire notification")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/xfrm')
| -rw-r--r-- | net/xfrm/xfrm_user.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index 1e50b70ad668..33878e6e0d0a 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -1025,10 +1025,12 @@ static inline int xfrm_nlmsg_multicast(struct net *net, struct sk_buff *skb, { struct sock *nlsk = rcu_dereference(net->xfrm.nlsk); - if (nlsk) - return nlmsg_multicast(nlsk, skb, pid, group, GFP_ATOMIC); - else - return -1; + if (!nlsk) { + kfree_skb(skb); + return -EPIPE; + } + + return nlmsg_multicast(nlsk, skb, pid, group, GFP_ATOMIC); } static inline unsigned int xfrm_spdinfo_msgsize(void) |