UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: 21ee543edc ("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>
This commit is contained in:
Florian Westphal 2018-06-25 14:00:07 +02:00 committed by Steffen Klassert
parent 8cc8877385
commit 86126b77dc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/xfrm/xfrm_user.c
View File

@ -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); struct sock *nlsk = rcu_dereference(net->xfrm.nlsk);
if (nlsk) if (!nlsk) {
return nlmsg_multicast(nlsk, skb, pid, group, GFP_ATOMIC); kfree_skb(skb);
else return -EPIPE;
return -1; }
return nlmsg_multicast(nlsk, skb, pid, group, GFP_ATOMIC);
} }
static inline unsigned int xfrm_spdinfo_msgsize(void) static inline unsigned int xfrm_spdinfo_msgsize(void)