|
|
@@ -289,13 +289,17 @@ static int gtp1u_udp_encap_recv(struct gtp_dev *gtp, struct sk_buff *skb)
|
|
|
return gtp_rx(pctx, skb, hdrlen, gtp->role);
|
|
|
}
|
|
|
|
|
|
-static void gtp_encap_destroy(struct sock *sk)
|
|
|
+static void __gtp_encap_destroy(struct sock *sk)
|
|
|
{
|
|
|
struct gtp_dev *gtp;
|
|
|
|
|
|
lock_sock(sk);
|
|
|
gtp = sk->sk_user_data;
|
|
|
if (gtp) {
|
|
|
+ if (gtp->sk0 == sk)
|
|
|
+ gtp->sk0 = NULL;
|
|
|
+ else
|
|
|
+ gtp->sk1u = NULL;
|
|
|
udp_sk(sk)->encap_type = 0;
|
|
|
rcu_assign_sk_user_data(sk, NULL);
|
|
|
sock_put(sk);
|
|
|
@@ -303,12 +307,19 @@ static void gtp_encap_destroy(struct sock *sk)
|
|
|
release_sock(sk);
|
|
|
}
|
|
|
|
|
|
+static void gtp_encap_destroy(struct sock *sk)
|
|
|
+{
|
|
|
+ rtnl_lock();
|
|
|
+ __gtp_encap_destroy(sk);
|
|
|
+ rtnl_unlock();
|
|
|
+}
|
|
|
+
|
|
|
static void gtp_encap_disable_sock(struct sock *sk)
|
|
|
{
|
|
|
if (!sk)
|
|
|
return;
|
|
|
|
|
|
- gtp_encap_destroy(sk);
|
|
|
+ __gtp_encap_destroy(sk);
|
|
|
}
|
|
|
|
|
|
static void gtp_encap_disable(struct gtp_dev *gtp)
|
|
|
@@ -1047,6 +1058,7 @@ static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info)
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
+ rtnl_lock();
|
|
|
rcu_read_lock();
|
|
|
|
|
|
gtp = gtp_find_dev(sock_net(skb->sk), info->attrs);
|
|
|
@@ -1071,6 +1083,7 @@ static int gtp_genl_new_pdp(struct sk_buff *skb, struct genl_info *info)
|
|
|
|
|
|
out_unlock:
|
|
|
rcu_read_unlock();
|
|
|
+ rtnl_unlock();
|
|
|
return err;
|
|
|
}
|
|
|
|