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

Revert "net: xfrm: Add '_rcu' tag for rcu protected pointer in netns_xfrm" 

This reverts commit f10e0010fa.

This commit was just wrong. It caused a lot of
syzbot warnings, so just revert it.

Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
This commit is contained in:
Steffen Klassert 2019-03-20 17:54:44 +01:00
parent 6ee02a54ef
commit bfc01ddff2
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/netns/xfrm.h
View File

@ -57,7 +57,7 @@ struct netns_xfrm {
struct list_head inexact_bins; struct list_head inexact_bins;
struct sock __rcu *nlsk; struct sock *nlsk;
struct sock *nlsk_stash; struct sock *nlsk_stash;
u32 sysctl_aevent_etime; u32 sysctl_aevent_etime;

30
net/xfrm/xfrm_user.c
View File

@ -1071,22 +1071,6 @@ static inline int xfrm_nlmsg_multicast(struct net *net, struct sk_buff *skb,
return nlmsg_multicast(nlsk, skb, pid, group, GFP_ATOMIC); return nlmsg_multicast(nlsk, skb, pid, group, GFP_ATOMIC);
} }
/* A similar wrapper like xfrm_nlmsg_multicast checking that nlsk is still
* available.
*/
static inline int xfrm_nlmsg_unicast(struct net *net, struct sk_buff *skb,
u32 pid)
{
struct sock *nlsk = rcu_dereference(net->xfrm.nlsk);
if (!nlsk) {
kfree_skb(skb);
return -EPIPE;
}
return nlmsg_unicast(nlsk, skb, pid);
}
static inline unsigned int xfrm_spdinfo_msgsize(void) static inline unsigned int xfrm_spdinfo_msgsize(void)
{ {
return NLMSG_ALIGN(4) return NLMSG_ALIGN(4)
@ -1211,7 +1195,7 @@ static int xfrm_get_spdinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
err = build_spdinfo(r_skb, net, sportid, seq, *flags); err = build_spdinfo(r_skb, net, sportid, seq, *flags);
BUG_ON(err < 0); BUG_ON(err < 0);
return xfrm_nlmsg_unicast(net, r_skb, sportid); return nlmsg_unicast(net->xfrm.nlsk, r_skb, sportid);
} }
static inline unsigned int xfrm_sadinfo_msgsize(void) static inline unsigned int xfrm_sadinfo_msgsize(void)
@ -1270,7 +1254,7 @@ static int xfrm_get_sadinfo(struct sk_buff *skb, struct nlmsghdr *nlh,
err = build_sadinfo(r_skb, net, sportid, seq, *flags); err = build_sadinfo(r_skb, net, sportid, seq, *flags);
BUG_ON(err < 0); BUG_ON(err < 0);
return xfrm_nlmsg_unicast(net, r_skb, sportid); return nlmsg_unicast(net->xfrm.nlsk, r_skb, sportid);
} }
static int xfrm_get_sa(struct sk_buff *skb, struct nlmsghdr *nlh, static int xfrm_get_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
@ -1290,7 +1274,7 @@ static int xfrm_get_sa(struct sk_buff *skb, struct nlmsghdr *nlh,
if (IS_ERR(resp_skb)) { if (IS_ERR(resp_skb)) {
err = PTR_ERR(resp_skb); err = PTR_ERR(resp_skb);
} else { } else {
err = xfrm_nlmsg_unicast(net, resp_skb, NETLINK_CB(skb).portid); err = nlmsg_unicast(net->xfrm.nlsk, resp_skb, NETLINK_CB(skb).portid);
} }
xfrm_state_put(x); xfrm_state_put(x);
out_noput: out_noput:
@ -1353,7 +1337,7 @@ static int xfrm_alloc_userspi(struct sk_buff *skb, struct nlmsghdr *nlh,
goto out; goto out;
} }
err = xfrm_nlmsg_unicast(net, resp_skb, NETLINK_CB(skb).portid); err = nlmsg_unicast(net->xfrm.nlsk, resp_skb, NETLINK_CB(skb).portid);
out: out:
xfrm_state_put(x); xfrm_state_put(x);
@ -1919,8 +1903,8 @@ static int xfrm_get_policy(struct sk_buff *skb, struct nlmsghdr *nlh,
if (IS_ERR(resp_skb)) { if (IS_ERR(resp_skb)) {
err = PTR_ERR(resp_skb); err = PTR_ERR(resp_skb);
} else { } else {
err = xfrm_nlmsg_unicast(net, resp_skb, err = nlmsg_unicast(net->xfrm.nlsk, resp_skb,
NETLINK_CB(skb).portid); NETLINK_CB(skb).portid);
} }
} else { } else {
xfrm_audit_policy_delete(xp, err ? 0 : 1, true); xfrm_audit_policy_delete(xp, err ? 0 : 1, true);
@ -2078,7 +2062,7 @@ static int xfrm_get_ae(struct sk_buff *skb, struct nlmsghdr *nlh,
err = build_aevent(r_skb, x, &c); err = build_aevent(r_skb, x, &c);
BUG_ON(err < 0); BUG_ON(err < 0);
err = xfrm_nlmsg_unicast(net, r_skb, NETLINK_CB(skb).portid); err = nlmsg_unicast(net->xfrm.nlsk, r_skb, NETLINK_CB(skb).portid);
spin_unlock_bh(&x->lock); spin_unlock_bh(&x->lock);
xfrm_state_put(x); xfrm_state_put(x);
return err; return err;