* Re: [PATCH v2] net: fix a concurrency bug in l2tp_tunnel_register()
[not found] <20210415141724.17471-1-sishuai@purdue.edu>
@ 2021-04-16 17:21 ` Cong Wang
2021-04-21 19:21 ` Gong, Sishuai
0 siblings, 1 reply; 2+ messages in thread
From: Cong Wang @ 2021-04-16 17:21 UTC (permalink / raw)
To: Sishuai Gong
Cc: David Miller, Jakub Kicinski, tparkin, Matthias Schiffer,
Linux Kernel Network Developers
On Thu, Apr 15, 2021 at 7:18 AM Sishuai Gong <sishuai@purdue.edu> wrote:
> diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
> index 203890e378cb..879f1264ec3c 100644
> --- a/net/l2tp/l2tp_core.c
> +++ b/net/l2tp/l2tp_core.c
> @@ -1478,6 +1478,9 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,
> tunnel->l2tp_net = net;
> pn = l2tp_pernet(net);
>
> + sk = sock->sk;
> + tunnel->sock = sk;
> +
> spin_lock_bh(&pn->l2tp_tunnel_list_lock);
> list_for_each_entry(tunnel_walk, &pn->l2tp_tunnel_list, list) {
> if (tunnel_walk->tunnel_id == tunnel->tunnel_id) {
> @@ -1490,9 +1493,7 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,
> list_add_rcu(&tunnel->list, &pn->l2tp_tunnel_list);
> spin_unlock_bh(&pn->l2tp_tunnel_list_lock);
>
> - sk = sock->sk;
> sock_hold(sk);
> - tunnel->sock = sk;
I think you have to hold this refcnt before making tunnel->sock visible
to others.
Why not just move this together and simply release the refcnt on error
path?
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 203890e378cb..8eb805ee18d4 100644
--- a/net/l2tp/l2tp_core.c
+++ b/net/l2tp/l2tp_core.c
@@ -1478,11 +1478,15 @@ int l2tp_tunnel_register(struct l2tp_tunnel
*tunnel, struct net *net,
tunnel->l2tp_net = net;
pn = l2tp_pernet(net);
+ sk = sock->sk;
+ sock_hold(sk);
+ tunnel->sock = sk;
+
spin_lock_bh(&pn->l2tp_tunnel_list_lock);
list_for_each_entry(tunnel_walk, &pn->l2tp_tunnel_list, list) {
if (tunnel_walk->tunnel_id == tunnel->tunnel_id) {
spin_unlock_bh(&pn->l2tp_tunnel_list_lock);
-
+ sock_put(sk);
ret = -EEXIST;
goto err_sock;
}
@@ -1490,10 +1494,6 @@ int l2tp_tunnel_register(struct l2tp_tunnel
*tunnel, struct net *net,
list_add_rcu(&tunnel->list, &pn->l2tp_tunnel_list);
spin_unlock_bh(&pn->l2tp_tunnel_list_lock);
- sk = sock->sk;
- sock_hold(sk);
- tunnel->sock = sk;
-
if (tunnel->encap == L2TP_ENCAPTYPE_UDP) {
struct udp_tunnel_sock_cfg udp_cfg = {
.sk_user_data = tunnel,
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] net: fix a concurrency bug in l2tp_tunnel_register()
2021-04-16 17:21 ` [PATCH v2] net: fix a concurrency bug in l2tp_tunnel_register() Cong Wang
@ 2021-04-21 19:21 ` Gong, Sishuai
0 siblings, 0 replies; 2+ messages in thread
From: Gong, Sishuai @ 2021-04-21 19:21 UTC (permalink / raw)
To: Cong Wang
Cc: David Miller, Jakub Kicinski, tparkin, Matthias Schiffer,
Linux Kernel Network Developers
On Apr 16, 2021, at 1:21 PM, Cong Wang <xiyou.wangcong@gmail.com> wrote:
>
> On Thu, Apr 15, 2021 at 7:18 AM Sishuai Gong <sishuai@purdue.edu> wrote:
>> diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
>> index 203890e378cb..879f1264ec3c 100644
>> --- a/net/l2tp/l2tp_core.c
>> +++ b/net/l2tp/l2tp_core.c
>> @@ -1478,6 +1478,9 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,
>> tunnel->l2tp_net = net;
>> pn = l2tp_pernet(net);
>>
>> + sk = sock->sk;
>> + tunnel->sock = sk;
>> +
>> spin_lock_bh(&pn->l2tp_tunnel_list_lock);
>> list_for_each_entry(tunnel_walk, &pn->l2tp_tunnel_list, list) {
>> if (tunnel_walk->tunnel_id == tunnel->tunnel_id) {
>> @@ -1490,9 +1493,7 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net,
>> list_add_rcu(&tunnel->list, &pn->l2tp_tunnel_list);
>> spin_unlock_bh(&pn->l2tp_tunnel_list_lock);
>>
>> - sk = sock->sk;
>> sock_hold(sk);
>> - tunnel->sock = sk;
>
> I think you have to hold this refcnt before making tunnel->sock visible
> to others.
>
> Why not just move this together and simply release the refcnt on error
> path?
Thanks. It totally makes sense. I am going to send the next version.
>
> diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
> index 203890e378cb..8eb805ee18d4 100644
> --- a/net/l2tp/l2tp_core.c
> +++ b/net/l2tp/l2tp_core.c
> @@ -1478,11 +1478,15 @@ int l2tp_tunnel_register(struct l2tp_tunnel
> *tunnel, struct net *net,
> tunnel->l2tp_net = net;
> pn = l2tp_pernet(net);
>
> + sk = sock->sk;
> + sock_hold(sk);
> + tunnel->sock = sk;
> +
> spin_lock_bh(&pn->l2tp_tunnel_list_lock);
> list_for_each_entry(tunnel_walk, &pn->l2tp_tunnel_list, list) {
> if (tunnel_walk->tunnel_id == tunnel->tunnel_id) {
> spin_unlock_bh(&pn->l2tp_tunnel_list_lock);
> -
> + sock_put(sk);
> ret = -EEXIST;
> goto err_sock;
> }
> @@ -1490,10 +1494,6 @@ int l2tp_tunnel_register(struct l2tp_tunnel
> *tunnel, struct net *net,
> list_add_rcu(&tunnel->list, &pn->l2tp_tunnel_list);
> spin_unlock_bh(&pn->l2tp_tunnel_list_lock);
>
> - sk = sock->sk;
> - sock_hold(sk);
> - tunnel->sock = sk;
> -
> if (tunnel->encap == L2TP_ENCAPTYPE_UDP) {
> struct udp_tunnel_sock_cfg udp_cfg = {
> .sk_user_data = tunnel,
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-21 19:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20210415141724.17471-1-sishuai@purdue.edu>
2021-04-16 17:21 ` [PATCH v2] net: fix a concurrency bug in l2tp_tunnel_register() Cong Wang
2021-04-21 19:21 ` Gong, Sishuai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.